wixtoolset
/
Tools
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Standardize on .NET Core v3.1

This commit is contained in:
Rob Mensching 2021-04-02 14:54:40 -07:00
Родитель 9331f113bc
Коммит 04dd968856
11 изменённых файлов: 23 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
appveyor.cmd
Просмотреть файл

@ -14,7 +14,7 @@ msbuild -p:Configuration=%_C% || exit /b
:: Test
dotnet test -c %_C% --no-build src\test\WixToolsetTest.BuildTasks || exit /b
dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b
dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp3.1 src\wix || exit /b
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
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\
robocopy %_P%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
robocopy %_P%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ -f netcoreapp3.1 src\WixToolset.BuildTasks || exit /b
dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat\ -f netcoreapp3.1 src\heat || exit /b
dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix\ -f netcoreapp3.1 src\wix || exit /b
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\ src\WixToolset.Sdk || exit /b
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r dne src\wix || exit /b
dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r linux-x64 src\wix || exit /b
dotnet test -c %_C% src\test\WixToolsetTest.Sdk || exit /b

6
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
Просмотреть файл

@ -3,12 +3,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<Description></Description>
<Title>WiX Toolset MSBuild Tasks</Title>
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
<!-- https://github.com/Microsoft/msbuild/issues/2360 -->
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
@ -28,7 +28,7 @@
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' ">
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' ">
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
</ItemGroup>

2
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
Просмотреть файл

@ -13,7 +13,7 @@
<files>
<file src="$projectFolder$$id$.props" target="build" />
<file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
<file src="netcoreapp3.1\*" target="tools\netcoreapp3.1" />
<file src="net461\*" target="tools\net461" />
<file src="net461\redirects\*" target="msbuild" />
</files>

2
src/WixToolset.Sdk/WixToolset.Sdk.csproj
Просмотреть файл

@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<Description>WiX Toolset MSBuild integration</Description>
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>

2
src/WixToolset.Sdk/tools/wix.targets
Просмотреть файл

@ -19,7 +19,7 @@
<!-- These properties can be overridden to support non-default installations. -->
<PropertyGroup>
<WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp2.1\</WixBinDir>
<WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp3.1\</WixBinDir>
<WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net461\x86\</WixBinDir>
<WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net461\x64\</WixBinDir64>
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>

2
src/dotnet-wix/dotnet-wix.csproj
Просмотреть файл

@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<Description>WiX Toolset Command-line interface</Description>
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>

4
src/dotnet-wix/dotnet-wix.nuspec
Просмотреть файл

@ -14,7 +14,7 @@
</metadata>
<files>
<file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp2.1\any" />
<file src="**" target="tools\netcoreapp2.1\any" />
<file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" />
<file src="**" target="tools\netcoreapp3.1\any" />
</files>
</package>

4
src/heat/heat.csproj
Просмотреть файл

@ -3,14 +3,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<OutputType>Exe</OutputType>
<Description>Harvester</Description>
<Title>WiX Harvester</Title>
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- <PackAsTool>true</PackAsTool> -->
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
<AppConfig>app.config</AppConfig>
<ApplicationManifest>heat.exe.manifest</ApplicationManifest>
<RollForward>LatestMajor</RollForward>

2
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
Просмотреть файл

@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp3.1' " />
<PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
<PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
</ItemGroup>

2
src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
Просмотреть файл

@ -17,7 +17,7 @@ namespace WixToolsetTest.Sdk
public static class MsbuildUtilities
{
public static readonly string WixMsbuildPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.Sdk");
public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk");
public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal")

4
src/wix/wix.csproj
Просмотреть файл

@ -3,14 +3,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<OutputType>Exe</OutputType>
<Description>Compiler</Description>
<Title>WiX Toolset Compiler</Title>
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- <PackAsTool>true</PackAsTool> -->
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier>
<AppConfig>app.config</AppConfig>
<ApplicationManifest>wix.exe.manifest</ApplicationManifest>
<RollForward>Major</RollForward>