Rename WixToolset.Msbuild to WixToolset.Sdk
Rob Mensching committed
Jun 26, 2020 at 01:09 UTC
5f89a76d42dd9d132f4454e196e4f26fd65333ee
46 files changed
+39
-39
Tools.sln
+2
-2
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BuildTasks", "sr
11
EndProject
12
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-wix", "src\dotnet-wix\dotnet-wix.csproj", "{938BCA04-610B-4B99-9CB7-02BF7397A972}"
13
EndProject
14
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.MSBuild", "src\WixToolset.MSBuild\WixToolset.MSBuild.csproj", "{0DF5D4CF-8457-469D-8288-13775E984F70}"
14
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sdk", "src\WixToolset.Sdk\WixToolset.Sdk.csproj", "{0DF5D4CF-8457-469D-8288-13775E984F70}"
15
EndProject
16
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{449BE9B0-422F-4039-A030-BDD3E7D97878}"
17
ProjectSection(SolutionItems) = preProject
@@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\
22
EndProject
23
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "src\heat\heat.csproj", "{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}"
24
EndProject
25
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.MSBuild", "src\test\WixToolsetTest.MSBuild\WixToolsetTest.MSBuild.csproj", "{7B610B7B-C69D-4A4C-9D65-F304C44479E7}"
25
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sdk", "src\test\WixToolsetTest.Sdk\WixToolsetTest.Sdk.csproj", "{7B610B7B-C69D-4A4C-9D65-F304C44479E7}"
26
EndProject
27
Global
28
GlobalSection(SolutionConfigurationPlatforms) = preSolution
appveyor.cmd
+26
-26
@@ -10,34 +10,34 @@ dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks || exit /b
10
11
dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b
12
13
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
14
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b
15
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b
16
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll
17
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
18
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
19
-
20
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b
21
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b
22
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b
23
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll
24
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
25
-robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
26
-
27
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
28
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
29
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
30
-robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
31
-robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
32
-robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
33
-
34
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild || exit /b
35
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix || exit /b
36
-
37
-dotnet test -c %_C% src\test\WixToolsetTest.MSBuild || exit /b
13
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
14
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b
15
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b
16
+robocopy %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll
17
+robocopy %_P%\WixToolset.Sdk\separate\net461\x86\heat %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO%
18
+robocopy %_P%\WixToolset.Sdk\separate\net461\x86\wix %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO%
19
+
20
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b
21
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b
22
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b
23
+robocopy %_P%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll
24
+robocopy %_P%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
25
+robocopy %_P%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO%
26
+
27
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
28
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
29
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
30
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
31
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
32
+robocopy %_P%\WixToolset.Sdk\separate\netcoreapp2.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp2.1 %_RCO%
33
+
34
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\ src\WixToolset.Sdk || exit /b
35
+dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r dne src\wix || exit /b
36
+
37
+dotnet test -c %_C% src\test\WixToolsetTest.Sdk || exit /b
38
39
dotnet pack -c %_C% src\dotnet-wix || exit /b
40
-dotnet pack -c %_C% src\WixToolset.MSBuild || exit /b
40
+dotnet pack -c %_C% src\WixToolset.Sdk || exit /b
41
42
msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b
43
src/Wix.Build.props
+1
-1
@@ -10,5 +10,5 @@
10
<BindInputPaths Include="$(OutputPath)Win32\" />
11
</ItemGroup>
12
13
- <Import Project="$(OutputPath)\publish\WixToolset.MSBuild\build\WixToolset.MSBuild.props" />
13
+ <Import Project="$(OutputPath)\publish\WixToolset.Sdk\build\WixToolset.Sdk.props" />
14
</Project>
src/WixToolset.Sdk/Sdk/Sdk.props
renamed
src/WixToolset.Sdk/Sdk/Sdk.targets
renamed
src/WixToolset.Sdk/WixToolset.Sdk.csproj
renamed
+1
-1
@@ -7,7 +7,7 @@
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset MSBuild integration</Description>
9
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
10
- <NuspecBasePath>$(OutputPath)publish\WixToolset.MSBuild\</NuspecBasePath>
10
+ <NuspecBasePath>$(OutputPath)publish\WixToolset.Sdk\</NuspecBasePath>
11
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
12
</PropertyGroup>
13
src/WixToolset.Sdk/WixToolset.Sdk.nuspec
renamed
src/WixToolset.Sdk/WixToolset.Sdk.v3.ncrunchproject
renamed
src/WixToolset.Sdk/build/WixToolset.Sdk.props
renamed
src/WixToolset.Sdk/tools/wix.ca.targets
renamed
src/WixToolset.Sdk/tools/wix.harvest.targets
renamed
src/WixToolset.Sdk/tools/wix.signing.targets
renamed
src/WixToolset.Sdk/tools/wix.targets
renamed
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+4
-4
@@ -10,10 +10,10 @@
10
</PropertyGroup>
11
12
<ItemGroup>
13
- <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" Link="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
14
- <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
15
- <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
16
- <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
13
+ <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" Link="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
14
+ <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
15
+ <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
16
+ <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
17
</ItemGroup>
18
19
<ItemGroup>
src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolsetTest.MSBuild
3
+namespace WixToolsetTest.Sdk
4
{
5
using System;
6
using System.Collections.Generic;
src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolsetTest.MSBuild
3
+namespace WixToolsetTest.Sdk
4
{
5
using System;
6
using System.Collections.Generic;
src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
renamed
+3
-3
@@ -1,6 +1,6 @@
1
// Copyright(c) .NET Foundation and contributors.All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolsetTest.MSBuild
3
+namespace WixToolsetTest.Sdk
4
{
5
using System;
6
using System.Collections.Generic;
@@ -17,8 +17,8 @@ namespace WixToolsetTest.MSBuild
17
18
public static class MsbuildUtilities
19
{
20
- public static readonly string WixMsbuildPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild");
21
- public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.MSBuild.props");
20
+ public static readonly string WixMsbuildPath = Path.Combine(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")
24
{