Standardize on .NET Core v3.1
Rob Mensching committed
Apr 2, 2021 at 14:54 UTC
04dd968856734d40e20802cd07e89f40ac871191
11 files changed
+23
-23
appveyor.cmd
+8
-8
@@ -14,7 +14,7 @@ msbuild -p:Configuration=%_C% || exit /b
14
:: Test
15
dotnet test -c %_C% --no-build src\test\WixToolsetTest.BuildTasks || exit /b
16
17
-dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b
17
+dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp3.1 src\wix || exit /b
18
19
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
20
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b
@@ -30,15 +30,15 @@ robocopy %_P%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\
30
robocopy %_P%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
31
robocopy %_P%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
32
33
-dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
34
-dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
35
-dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
36
-robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
37
-robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
38
-robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
33
+dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ -f netcoreapp3.1 src\WixToolset.BuildTasks || exit /b
34
+dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat\ -f netcoreapp3.1 src\heat || exit /b
35
+dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix\ -f netcoreapp3.1 src\wix || exit /b
36
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
37
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
38
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
39
40
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\ src\WixToolset.Sdk || exit /b
41
-dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r dne src\wix || exit /b
41
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r linux-x64 src\wix || exit /b
42
43
dotnet test -c %_C% src\test\WixToolsetTest.Sdk || exit /b
44
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+3
-3
@@ -3,12 +3,12 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
7
<Description></Description>
8
<Title>WiX Toolset MSBuild Tasks</Title>
9
<DebugType>embedded</DebugType>
10
<PublishRepositoryUrl>true</PublishRepositoryUrl>
11
- <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
11
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
12
<!-- https://github.com/Microsoft/msbuild/issues/2360 -->
13
<PlatformTarget>AnyCPU</PlatformTarget>
14
</PropertyGroup>
@@ -28,7 +28,7 @@
28
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
29
</ItemGroup>
30
31
- <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' ">
31
+ <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' ">
32
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
33
</ItemGroup>
34
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+1
-1
@@ -13,7 +13,7 @@
13
<files>
14
<file src="$projectFolder$$id$.props" target="build" />
15
16
- <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
16
+ <file src="netcoreapp3.1\*" target="tools\netcoreapp3.1" />
17
<file src="net461\*" target="tools\net461" />
18
<file src="net461\redirects\*" target="msbuild" />
19
</files>
src/WixToolset.Sdk/WixToolset.Sdk.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netcoreapp2.1</TargetFramework>
6
+ <TargetFramework>netcoreapp3.1</TargetFramework>
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset MSBuild integration</Description>
9
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
src/WixToolset.Sdk/tools/wix.targets
+1
-1
@@ -19,7 +19,7 @@
19
20
<!-- These properties can be overridden to support non-default installations. -->
21
<PropertyGroup>
22
- <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp2.1\</WixBinDir>
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>
25
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
src/dotnet-wix/dotnet-wix.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netcoreapp2.1</TargetFramework>
6
+ <TargetFramework>netcoreapp3.1</TargetFramework>
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset Command-line interface</Description>
9
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
src/dotnet-wix/dotnet-wix.nuspec
+2
-2
@@ -14,7 +14,7 @@
14
</metadata>
15
16
<files>
17
- <file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp2.1\any" />
18
- <file src="**" target="tools\netcoreapp2.1\any" />
17
+ <file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" />
18
+ <file src="**" target="tools\netcoreapp3.1\any" />
19
</files>
20
</package>
src/heat/heat.csproj
+2
-2
@@ -3,14 +3,14 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
7
<OutputType>Exe</OutputType>
8
<Description>Harvester</Description>
9
<Title>WiX Harvester</Title>
10
<DebugType>embedded</DebugType>
11
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12
<!-- <PackAsTool>true</PackAsTool> -->
13
- <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
13
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
14
<AppConfig>app.config</AppConfig>
15
<ApplicationManifest>heat.exe.manifest</ApplicationManifest>
16
<RollForward>LatestMajor</RollForward>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1
-1
@@ -22,7 +22,7 @@
22
23
<ItemGroup>
24
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
25
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
25
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp3.1' " />
26
<PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
27
<PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
28
</ItemGroup>
src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+1
-1
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Sdk
17
18
public static class MsbuildUtilities
19
{
20
- public static readonly string WixMsbuildPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.Sdk");
20
+ public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk");
21
public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
22
23
public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal")
src/wix/wix.csproj
+2
-2
@@ -3,14 +3,14 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
7
<OutputType>Exe</OutputType>
8
<Description>Compiler</Description>
9
<Title>WiX Toolset Compiler</Title>
10
<DebugType>embedded</DebugType>
11
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12
<!-- <PackAsTool>true</PackAsTool> -->
13
- <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
13
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
14
<AppConfig>app.config</AppConfig>
15
<ApplicationManifest>wix.exe.manifest</ApplicationManifest>
16
<RollForward>Major</RollForward>