@joebigelow / wix-1 / commits / ebe9e917

Switch to `net472` as Framework baseline.

Bob Arnson committed Dec 11, 2021 at 22:56 UTC ebe9e91768d9514e8dbd617aaa05366365a05cf7
23 files changed +43 -42
src/api/burn/burn.proj
+1
@@ -27,6 +27,7 @@
27 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
28
29 <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" />
30 + <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" />
31
32 <!-- Test -->
33 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
src/api/wix/WixToolset.Data/WixToolset.Data.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <LangVersion>7.3</LangVersion>
9 <Description>WiX Toolset Data</Description>
10 <DebugType>embedded</DebugType>
src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Title>WiX Toolset Extensibility</Title>
9 <Description></Description>
10 <DebugType>embedded</DebugType>
src/api/wix/wix.proj
+1
@@ -3,6 +3,7 @@
3 <!-- Build -->
4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
5 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
6 + <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
7
8 <!-- Pack -->
9 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+1 -1
@@ -2,7 +2,7 @@
2
3 <PropertyGroup>
4 <OutputType>Exe</OutputType>
5 - <TargetFramework>net461</TargetFramework>
5 + <TargetFramework>net472</TargetFramework>
6 <IsTool>true</IsTool>
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
8 <DebugType>embedded</DebugType>
src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5
6 <PropertyGroup>
7 - <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7 + <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
8 <IsPackable>true</IsPackable>
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+3 -3
@@ -2,8 +2,8 @@
2
3 <PropertyGroup>
4 <OutputType>Exe</OutputType>
5 - <!-- <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> -->
6 - <TargetFrameworks>net461</TargetFrameworks>
5 + <!-- <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks> -->
6 + <TargetFrameworks>net472</TargetFrameworks>
7 <IsTool>true</IsTool>
8 <IncludeBuildOutput>false</IncludeBuildOutput>
9 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
@@ -17,7 +17,7 @@
17 <Content Include="build\WixBuildTools.XsdGen.targets" PackagePath="build\" />
18 <Content Include="buildCrossTargeting\WixBuildTools.XsdGen.targets" PackagePath="buildCrossTargeting\" />
19
20 - <Content Include="$(OutputPath)net461\$(TargetFileName)" PackagePath="tools\full" />
20 + <Content Include="$(OutputPath)net472\$(TargetFileName)" PackagePath="tools\full" />
21 <!-- <Content Include="$(OutputPath)netcoreapp2.0\$(TargetFileName)" PackagePath="tools\core" /> -->
22 </ItemGroup>
23
src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
6 + <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 <RootNamespace>WixToolset.Dtf.Tools.MakeSfxCA</RootNamespace>
9 <AssemblyName>MakeSfxCA</AssemblyName>
src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+3 -3
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
6 + <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <Description></Description>
8 <Title>WiX Toolset MSBuild Tasks</Title>
9 <DebugType>embedded</DebugType>
@@ -17,14 +17,14 @@
17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
18 </ItemGroup>
19
20 - <ItemGroup Condition="'$(TargetFramework)'=='net461'">
20 + <ItemGroup Condition="'$(TargetFramework)'=='net472'">
21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
24 <PackageReference Include="Microsoft.Build.Tasks.Core" />
25 </ItemGroup>
26
27 - <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
27 + <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
28 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
29 </ItemGroup>
30
src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+1 -2
@@ -5,7 +5,7 @@
5
6 <PropertyGroup>
7 <TargetFrameworks>netstandard2.0</TargetFrameworks>
8 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
8 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
9 <Description>Symbolizer</Description>
10 <Title>WiX Toolset Converters Tuplizer</Title>
11 <DebugType>embedded</DebugType>
@@ -15,7 +15,6 @@
15
16 <ItemGroup>
17 <Reference Include="wix" HintPath="..\deps\wix.dll" />
18 - <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net461" />
18 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" />
19 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" />
20 </ItemGroup>
src/wix/WixToolset.Converters/WixToolset.Converters.csproj
+1 -1
@@ -5,7 +5,7 @@
5
6 <PropertyGroup>
7 <TargetFrameworks>netstandard2.0</TargetFrameworks>
8 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
8 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
9 <Description>Converter</Description>
10 <Title>WiX Toolset Converters</Title>
11 <DebugType>embedded</DebugType>
src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core Burn</Description>
9 <Title>WiX Toolset Core Burn</Title>
10 <DebugType>embedded</DebugType>
src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Extension Cache</Description>
9 <Title>WiX Toolset Extension Cache</Title>
10 <DebugType>embedded</DebugType>
src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Internal WiX Toolset Test Package</Description>
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core Windows Installer</Description>
9 <Title>WiX Toolset Core Windows Installer</Title>
10 <DebugType>embedded</DebugType>
src/wix/WixToolset.Core/WixToolset.Core.csproj
+1 -1
@@ -4,7 +4,7 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFrameworks>netstandard2.0</TargetFrameworks>
7 - <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks>
7 + <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core</Description>
9 <Title>WiX Toolset Core</Title>
10 <DebugType>embedded</DebugType>
src/wix/WixToolset.Sdk/tools/wix.targets
+2 -2
@@ -20,8 +20,8 @@
20 <!-- These properties can be overridden to support non-default installations. -->
21 <PropertyGroup>
22 <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp3.1\</WixBinDir>
23 - <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net461\x86\</WixBinDir>
24 - <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net461\x64\</WixBinDir64>
23 + <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net472\x86\</WixBinDir>
24 + <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net472\x64\</WixBinDir64>
25 <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
26 <WixTasksPath64 Condition=" '$(WixTasksPath64)' == '' and '$(WixBinDir64)' != '' ">$(WixBinDir64)WixToolset.BuildTasks.dll</WixTasksPath64>
27 </PropertyGroup>
src/wix/heat/heat.csproj
+2 -2
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
6 + <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 <Description>Harvester</Description>
9 <Title>WiX Harvester</Title>
@@ -46,7 +46,7 @@
46 <PackageReference Include="System.DirectoryServices" />
47 </ItemGroup>
48
49 - <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
49 + <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
50 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
51 </ItemGroup>
52 </Project>
src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>net461</TargetFramework>
6 + <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>net461</TargetFramework>
6 + <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>net461</TargetFramework>
6 + <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
src/wix/wix.cmd
+14 -14
@@ -37,19 +37,19 @@ dotnet test -c %_C% --no-build test\WixToolsetTest.Heat || exit /b
37 :: Publish
38 msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b
39
40 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
41 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\heat\ heat\heat.csproj || exit /b
42 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\wix\ wix\wix.csproj || exit /b
43 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\buildtasks %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll
44 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\heat %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO%
45 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\wix %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO%
46 -
47 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
48 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\heat\ heat\heat.csproj || exit /b
49 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\wix\ wix\wix.csproj || exit /b
50 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll
51 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
52 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
40 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
41 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\heat\ heat\heat.csproj || exit /b
42 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\wix\ wix\wix.csproj || exit /b
43 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
44 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
45 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
46 +
47 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
48 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\heat\ heat\heat.csproj || exit /b
49 +msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\wix\ wix\wix.csproj || exit /b
50 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll
51 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
52 +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
53
54 msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
55 msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\heat\ heat\heat.csproj || exit /b
@@ -61,7 +61,7 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\
61 msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
62
63 :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
64 -:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net461\ wix\wix.csproj || exit /b
64 +:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b
65
66
67 :: Test
src/wix/wix/wix.csproj
+2 -2
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
6 + <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 <Description>WiX Toolset creates installation packages.</Description>
9 <DebugType>embedded</DebugType>
@@ -20,7 +20,7 @@
20 <NoWarn>NU1701</NoWarn>
21 </PropertyGroup>
22
23 - <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
23 + <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
24 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
25 </ItemGroup>
26