Merge branch 'dev'

iswix-llc · Jan 31, 2023 · eb91416 · eb91416
2 parents f3fcbb7 + fda799f
commit eb91416
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...eatWaveBootstrapperSolutionTemplate/BootstrapperProjectTemplate/IsWiXBootstrapper.wixproj b/...eatWaveBootstrapperSolutionTemplate/BootstrapperProjectTemplate/IsWiXBootstrapper.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
   <PropertyGroup>
     <ProductVersion>3.8</ProductVersion>
     <OutputName>TestApp</OutputName>
@@ -23,7 +23,7 @@
     <DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.0-rc.1" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.0-rc.2" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Code" />

diff --git a/.../HeatWaveBootstrapperSolutionTemplate/MergeModuleProjectTemplate/IsWiXMergeModule.wixproj b/.../HeatWaveBootstrapperSolutionTemplate/MergeModuleProjectTemplate/IsWiXMergeModule.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
   <PropertyGroup>
     <ProductVersion>3.7</ProductVersion>
     <OutputType>Module</OutputType>

diff --git a/...AddIn/HeatWaveBootstrapperSolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj b/...AddIn/HeatWaveBootstrapperSolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
  <PropertyGroup>
     <ProductVersion>3.7</ProductVersion>
     <!-- If MSIProductVersion not passed in, try to get it from TFBuild Environments (XAML Builds)-->
@@ -29,7 +29,7 @@
     <ProjectReference Include="..\$globalsafeprojectname$MM\$globalsafeprojectname$MM.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Iis.wixext" Version="4.0.0-rc.1" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.0-rc.1" />
+    <PackageReference Include="WixToolset.Iis.wixext" Version="4.0.0-rc.2" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.0-rc.2" />
   </ItemGroup>
 </Project>
diff --git a/...2022AddIn/HeatWaveMSISolutionTemplate/MergeModuleProjectTemplate/IsWiXMergeModule.wixproj b/...2022AddIn/HeatWaveMSISolutionTemplate/MergeModuleProjectTemplate/IsWiXMergeModule.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
   <PropertyGroup>
     <ProductVersion>3.7</ProductVersion>
     <OutputType>Module</OutputType>

diff --git a/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj b/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
  <PropertyGroup>
     <ProductVersion>3.7</ProductVersion>
     <!-- If MSIProductVersion not passed in, try to get it from TFBuild Environments (XAML Builds)-->
@@ -39,8 +39,8 @@
     <ProjectReference Include="..\$safeprojectname$MM\$safeprojectname$MM.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Iis.wixext" Version="4.0.0-rc.1" />
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.0-rc.1" />
+    <PackageReference Include="WixToolset.Iis.wixext" Version="4.0.0-rc.2" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.2" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.0-rc.2" />
   </ItemGroup>
 </Project>
diff --git a/Application/IsWiX2022AddIn/HeatWaveMergeModuleProjectTemplate/IsWiXMergeModule.wixproj b/Application/IsWiX2022AddIn/HeatWaveMergeModuleProjectTemplate/IsWiXMergeModule.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.0-rc.2">
   <PropertyGroup>
     <OutputType>Module</OutputType>
   </PropertyGroup>