From df016066100df955d5ff98811e113fb2b1bd4b8a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 26 Apr 2021 11:31:05 -0700 Subject: Implement integrated build process --- src/ext/PowerShell/CSharp.Build.props | 11 ----- src/ext/PowerShell/Directory.Build.props | 25 ++--------- src/ext/PowerShell/Directory.Build.targets | 48 --------------------- src/ext/PowerShell/FindLocalWix.props | 8 ---- src/ext/PowerShell/PowerShell.wixext.sln | 6 +-- src/ext/PowerShell/appveyor.cmd | 13 ------ src/ext/PowerShell/appveyor.yml | 40 ----------------- src/ext/PowerShell/nuget.config | 14 ------ src/ext/PowerShell/ps.cmd | 24 +++++++++++ .../WixToolsetTest.Powershell.csproj | 21 +++------ src/ext/PowerShell/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.PowerShell.wixext.csproj | 6 +-- src/ext/PowerShell/wixlib/powershell.wixproj | 3 +- 13 files changed, 39 insertions(+), 180 deletions(-) delete mode 100644 src/ext/PowerShell/CSharp.Build.props delete mode 100644 src/ext/PowerShell/Directory.Build.targets delete mode 100644 src/ext/PowerShell/FindLocalWix.props delete mode 100644 src/ext/PowerShell/appveyor.cmd delete mode 100644 src/ext/PowerShell/appveyor.yml delete mode 100644 src/ext/PowerShell/nuget.config create mode 100644 src/ext/PowerShell/ps.cmd delete mode 100644 src/ext/PowerShell/wix.snk (limited to 'src/ext/PowerShell') diff --git a/src/ext/PowerShell/CSharp.Build.props b/src/ext/PowerShell/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/PowerShell/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/PowerShell/Directory.Build.props b/src/ext/PowerShell/Directory.Build.props index f83cc154..af932016 100644 --- a/src/ext/PowerShell/Directory.Build.props +++ b/src/ext/PowerShell/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + PowerShell.wixext - - - - + diff --git a/src/ext/PowerShell/Directory.Build.targets b/src/ext/PowerShell/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/PowerShell/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/PowerShell/FindLocalWix.props b/src/ext/PowerShell/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/ext/PowerShell/FindLocalWix.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets - - diff --git a/src/ext/PowerShell/PowerShell.wixext.sln b/src/ext/PowerShell/PowerShell.wixext.sln index a036d47e..e1e6a7d8 100644 --- a/src/ext/PowerShell/PowerShell.wixext.sln +++ b/src/ext/PowerShell/PowerShell.wixext.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "src\wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "src\wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/PowerShell/appveyor.cmd b/src/ext/PowerShell/appveyor.cmd deleted file mode 100644 index 27d33a5d..00000000 --- a/src/ext/PowerShell/appveyor.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore - -msbuild -p:Configuration=Release -t:Restore - -msbuild -p:Configuration=Release src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.PowerShell.wixext.csproj - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/PowerShell/appveyor.yml b/src/ext/PowerShell/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/PowerShell/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# 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. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/PowerShell/nuget.config b/src/ext/PowerShell/nuget.config deleted file mode 100644 index f4f0704e..00000000 --- a/src/ext/PowerShell/nuget.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd new file mode 100644 index 00000000..66eed1db --- /dev/null +++ b/src/ext/PowerShell/ps.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo PowerShell.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 69645fb7..4a33631a 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -12,10 +13,7 @@ - - - - + @@ -23,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/PowerShell/wix.snk b/src/ext/PowerShell/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/PowerShell/wix.snk and /dev/null differ diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj index a89a574c..4d5403d7 100644 --- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj +++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj @@ -17,14 +17,10 @@ - + - - - - diff --git a/src/ext/PowerShell/wixlib/powershell.wixproj b/src/ext/PowerShell/wixlib/powershell.wixproj index 6d6b413b..f35c819a 100644 --- a/src/ext/PowerShell/wixlib/powershell.wixproj +++ b/src/ext/PowerShell/wixlib/powershell.wixproj @@ -6,6 +6,7 @@ - + + -- cgit v1.2.3-55-g6feb