diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-21 11:01:10 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-29 16:24:05 -0700 |
| commit | d2f27517dffc02b7c50e386793c7ad89762c6b64 (patch) | |
| tree | 7c0fa5024c1a6672b3716861a640faacb70658ad | |
| parent | 8deeffb615244c62a0c94ea99d01ece88b1caf09 (diff) | |
| download | wix-d2f27517dffc02b7c50e386793c7ad89762c6b64.tar.gz wix-d2f27517dffc02b7c50e386793c7ad89762c6b64.tar.bz2 wix-d2f27517dffc02b7c50e386793c7ad89762c6b64.zip | |
Integrate new build scripts with signing support
| -rw-r--r-- | .gitignore | 43 | ||||
| -rw-r--r-- | appveyor.cmd | 5 | ||||
| -rw-r--r-- | signing.json | 13 | ||||
| -rw-r--r-- | src/Directory.Build.props | 5 | ||||
| -rw-r--r-- | src/Directory.Build.targets | 85 | ||||
| -rw-r--r-- | src/Directory.csproj.props (renamed from src/CSharp.Build.props) | 0 | ||||
| -rw-r--r-- | src/Directory.vcxproj.props (renamed from src/Cpp.Build.props) | 5 | ||||
| -rw-r--r-- | src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 12 | ||||
| -rw-r--r-- | src/balutil/balutil.vcxproj | 6 | ||||
| -rw-r--r-- | src/bextutil/bextutil.vcxproj | 6 | ||||
| -rw-r--r-- | src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 1 | ||||
| -rw-r--r-- | src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | 1 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj | 1 |
13 files changed, 112 insertions, 71 deletions
| @@ -13,6 +13,9 @@ | |||
| 13 | # User-specific files (MonoDevelop/Xamarin Studio) | 13 | # User-specific files (MonoDevelop/Xamarin Studio) |
| 14 | *.userprefs | 14 | *.userprefs |
| 15 | 15 | ||
| 16 | # Mono auto generated files | ||
| 17 | mono_crash.* | ||
| 18 | |||
| 16 | # Build results | 19 | # Build results |
| 17 | [Dd]ebug/ | 20 | [Dd]ebug/ |
| 18 | [Dd]ebugPublic/ | 21 | [Dd]ebugPublic/ |
| @@ -20,12 +23,14 @@ | |||
| 20 | [Rr]eleases/ | 23 | [Rr]eleases/ |
| 21 | x64/ | 24 | x64/ |
| 22 | x86/ | 25 | x86/ |
| 26 | [Ww][Ii][Nn]32/ | ||
| 23 | [Aa][Rr][Mm]/ | 27 | [Aa][Rr][Mm]/ |
| 24 | [Aa][Rr][Mm]64/ | 28 | [Aa][Rr][Mm]64/ |
| 25 | bld/ | 29 | bld/ |
| 26 | [Bb]in/ | 30 | [Bb]in/ |
| 27 | [Oo]bj/ | 31 | [Oo]bj/ |
| 28 | [Ll]og/ | 32 | [Ll]og/ |
| 33 | [Ll]ogs/ | ||
| 29 | 34 | ||
| 30 | # Visual Studio 2015/2017 cache/options directory | 35 | # Visual Studio 2015/2017 cache/options directory |
| 31 | .vs/ | 36 | .vs/ |
| @@ -39,9 +44,10 @@ Generated\ Files/ | |||
| 39 | [Tt]est[Rr]esult*/ | 44 | [Tt]est[Rr]esult*/ |
| 40 | [Bb]uild[Ll]og.* | 45 | [Bb]uild[Ll]og.* |
| 41 | 46 | ||
| 42 | # NUNIT | 47 | # NUnit |
| 43 | *.VisualState.xml | 48 | *.VisualState.xml |
| 44 | TestResult.xml | 49 | TestResult.xml |
| 50 | nunit-*.xml | ||
| 45 | 51 | ||
| 46 | # Build Results of an ATL Project | 52 | # Build Results of an ATL Project |
| 47 | [Dd]ebugPS/ | 53 | [Dd]ebugPS/ |
| @@ -56,6 +62,9 @@ project.lock.json | |||
| 56 | project.fragment.lock.json | 62 | project.fragment.lock.json |
| 57 | artifacts/ | 63 | artifacts/ |
| 58 | 64 | ||
| 65 | # ASP.NET Scaffolding | ||
| 66 | ScaffoldingReadMe.txt | ||
| 67 | |||
| 59 | # StyleCop | 68 | # StyleCop |
| 60 | StyleCopReport.xml | 69 | StyleCopReport.xml |
| 61 | 70 | ||
| @@ -122,9 +131,6 @@ _ReSharper*/ | |||
| 122 | *.[Rr]e[Ss]harper | 131 | *.[Rr]e[Ss]harper |
| 123 | *.DotSettings.user | 132 | *.DotSettings.user |
| 124 | 133 | ||
| 125 | # JustCode is a .NET coding add-in | ||
| 126 | .JustCode | ||
| 127 | |||
| 128 | # TeamCity is a build add-in | 134 | # TeamCity is a build add-in |
| 129 | _TeamCity* | 135 | _TeamCity* |
| 130 | 136 | ||
| @@ -135,6 +141,11 @@ _TeamCity* | |||
| 135 | .axoCover/* | 141 | .axoCover/* |
| 136 | !.axoCover/settings.json | 142 | !.axoCover/settings.json |
| 137 | 143 | ||
| 144 | # Coverlet is a free, cross platform Code Coverage Tool | ||
| 145 | coverage*.json | ||
| 146 | coverage*.xml | ||
| 147 | coverage*.info | ||
| 148 | |||
| 138 | # Visual Studio code coverage results | 149 | # Visual Studio code coverage results |
| 139 | *.coverage | 150 | *.coverage |
| 140 | *.coveragexml | 151 | *.coveragexml |
| @@ -182,6 +193,8 @@ PublishScripts/ | |||
| 182 | 193 | ||
| 183 | # NuGet Packages | 194 | # NuGet Packages |
| 184 | *.nupkg | 195 | *.nupkg |
| 196 | # NuGet Symbol Packages | ||
| 197 | *.snupkg | ||
| 185 | # The packages folder can be ignored because of Package Restore | 198 | # The packages folder can be ignored because of Package Restore |
| 186 | **/[Pp]ackages/* | 199 | **/[Pp]ackages/* |
| 187 | # except build/, which is used as an MSBuild target. | 200 | # except build/, which is used as an MSBuild target. |
| @@ -206,6 +219,8 @@ BundleArtifacts/ | |||
| 206 | Package.StoreAssociation.xml | 219 | Package.StoreAssociation.xml |
| 207 | _pkginfo.txt | 220 | _pkginfo.txt |
| 208 | *.appx | 221 | *.appx |
| 222 | *.appxbundle | ||
| 223 | *.appxupload | ||
| 209 | 224 | ||
| 210 | # Visual Studio cache files | 225 | # Visual Studio cache files |
| 211 | # files ending in .cache can be ignored | 226 | # files ending in .cache can be ignored |
| @@ -231,8 +246,6 @@ orleans.codegen.cs | |||
| 231 | # Since there are multiple workflows, uncomment next line to ignore bower_components | 246 | # Since there are multiple workflows, uncomment next line to ignore bower_components |
| 232 | # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) | 247 | # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) |
| 233 | #bower_components/ | 248 | #bower_components/ |
| 234 | # ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true | ||
| 235 | **/wwwroot/lib/ | ||
| 236 | 249 | ||
| 237 | # RIA/Silverlight projects | 250 | # RIA/Silverlight projects |
| 238 | Generated_Code/ | 251 | Generated_Code/ |
| @@ -257,6 +270,9 @@ ServiceFabricBackup/ | |||
| 257 | *.bim.layout | 270 | *.bim.layout |
| 258 | *.bim_*.settings | 271 | *.bim_*.settings |
| 259 | *.rptproj.rsuser | 272 | *.rptproj.rsuser |
| 273 | *- [Bb]ackup.rdl | ||
| 274 | *- [Bb]ackup ([0-9]).rdl | ||
| 275 | *- [Bb]ackup ([0-9][0-9]).rdl | ||
| 260 | 276 | ||
| 261 | # Microsoft Fakes | 277 | # Microsoft Fakes |
| 262 | FakesAssemblies/ | 278 | FakesAssemblies/ |
| @@ -292,10 +308,6 @@ paket-files/ | |||
| 292 | # FAKE - F# Make | 308 | # FAKE - F# Make |
| 293 | .fake/ | 309 | .fake/ |
| 294 | 310 | ||
| 295 | # JetBrains Rider | ||
| 296 | .idea/ | ||
| 297 | *.sln.iml | ||
| 298 | |||
| 299 | # CodeRush personal settings | 311 | # CodeRush personal settings |
| 300 | .cr/personal | 312 | .cr/personal |
| 301 | 313 | ||
| @@ -337,5 +349,14 @@ ASALocalRun/ | |||
| 337 | # Local History for Visual Studio | 349 | # Local History for Visual Studio |
| 338 | .localhistory/ | 350 | .localhistory/ |
| 339 | 351 | ||
| 340 | # BeatPulse healthcheck temp database | 352 | # BeatPulse healthcheck temp database |
| 341 | healthchecksdb | 353 | healthchecksdb |
| 354 | |||
| 355 | # Backup folder for Package Reference Convert tool in Visual Studio 2017 | ||
| 356 | MigrationBackup/ | ||
| 357 | |||
| 358 | # Ionide (cross platform F# VS Code tools) working folder | ||
| 359 | .ionide/ | ||
| 360 | |||
| 361 | # Fody - auto-generated XML schema | ||
| 362 | FodyWeavers.xsd \ No newline at end of file | ||
diff --git a/appveyor.cmd b/appveyor.cmd index 19c2d49f..d765e3ea 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | @setlocal | 1 | @setlocal |
| 2 | @pushd %~dp0 | 2 | @pushd %~dp0 |
| 3 | @set _C=Release | 3 | @set _C=Release |
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 4 | 5 | ||
| 5 | nuget restore || exit /b | 6 | nuget restore || exit /b |
| 6 | 7 | ||
| @@ -17,8 +18,8 @@ msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b | |||
| 17 | 18 | ||
| 18 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | 19 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b |
| 19 | 20 | ||
| 20 | msbuild -t:Pack -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b | 21 | msbuild -t:PackNative -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b |
| 21 | msbuild -t:Pack -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b | 22 | msbuild -t:PackNative -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b |
| 22 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b | 23 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b |
| 23 | 24 | ||
| 24 | @popd | 25 | @popd |
diff --git a/signing.json b/signing.json new file mode 100644 index 00000000..fe1c8c9b --- /dev/null +++ b/signing.json | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | { | ||
| 2 | "SignClient": { | ||
| 3 | "AzureAd": { | ||
| 4 | "AADInstance": "https://login.microsoftonline.com/", | ||
| 5 | "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8", | ||
| 6 | "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e" | ||
| 7 | }, | ||
| 8 | "Service": { | ||
| 9 | "Url": "https://codesign.dotnetfoundation.org/", | ||
| 10 | "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001" | ||
| 11 | } | ||
| 12 | } | ||
| 13 | } | ||
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f83cc154..fb34d54e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | <PropertyGroup> | 8 | <PropertyGroup> |
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
| 12 | 11 | ||
| 13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
| 14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> |
| @@ -22,8 +21,6 @@ | |||
| 22 | <Product>WiX Toolset</Product> | 21 | <Product>WiX Toolset</Product> |
| 23 | </PropertyGroup> | 22 | </PropertyGroup> |
| 24 | 23 | ||
| 25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> | 24 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> |
| 26 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> | ||
| 27 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
| 28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
| 29 | </Project> | 26 | </Project> |
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index cb988931..44701fb6 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets | |||
| @@ -4,53 +4,70 @@ | |||
| 4 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets | 4 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets |
| 5 | then update all of the repos. | 5 | then update all of the repos. |
| 6 | --> | 6 | --> |
| 7 | <!-- | ||
| 8 | Replace PackageReferences with ProjectReferences when the projects can be found in .sln. | ||
| 9 | See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 | ||
| 10 | --> | ||
| 11 | <Project> | 7 | <Project> |
| 12 | <PropertyGroup> | 8 | <PropertyGroup> |
| 13 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | 9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> |
| 14 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | 10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> |
| 11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | ||
| 12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | ||
| 15 | </PropertyGroup> | 13 | </PropertyGroup> |
| 16 | 14 | ||
| 17 | <PropertyGroup> | 15 | <PropertyGroup> |
| 18 | <ReplacePackageReferences>true</ReplacePackageReferences> | 16 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> |
| 19 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | 17 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> |
| 20 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 21 | </PropertyGroup> | 18 | </PropertyGroup> |
| 22 | 19 | ||
| 23 | <Choose> | 20 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" |
| 24 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | 21 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> |
| 22 | <PropertyGroup> | ||
| 23 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 24 | |||
| 25 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 26 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath> | ||
| 27 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | ||
| 28 | <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 29 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 30 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 31 | </PropertyGroup> | ||
| 32 | </Target> | ||
| 33 | |||
| 34 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties" | ||
| 35 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 36 | |||
| 37 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | ||
| 38 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | ||
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | ||
| 42 | </ItemGroup> | ||
| 43 | </Target> | ||
| 44 | |||
| 45 | <Target Name="_GetSignClient" | ||
| 46 | Condition=" !Exists('$(SigningToolExe)') "> | ||
| 25 | 47 | ||
| 26 | <PropertyGroup> | 48 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> |
| 27 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 28 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 29 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 30 | </PropertyGroup> | ||
| 31 | 49 | ||
| 32 | <ItemGroup> | 50 | <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' /> |
| 33 | <!-- Keep the identity of the PackageReference --> | 51 | </Target> |
| 34 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 35 | <PackageName>%(Identity)</PackageName> | ||
| 36 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 37 | </SmartPackageReference> | ||
| 38 | 52 | ||
| 39 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | 53 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" |
| 40 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | 54 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and |
| 41 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | 55 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> |
| 42 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 43 | </PackageInSolution> | ||
| 44 | 56 | ||
| 45 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | 57 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' |
| 58 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 59 | </Target> | ||
| 46 | 60 | ||
| 47 | <!-- Remove the package references that are now referenced as projects --> | 61 | <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative" |
| 48 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | 62 | Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' "> |
| 49 | </ItemGroup> | 63 | <ItemGroup> |
| 64 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | ||
| 65 | </ItemGroup> | ||
| 50 | 66 | ||
| 51 | </When> | 67 | <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' |
| 52 | </Choose> | 68 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 69 | </Target> | ||
| 53 | 70 | ||
| 54 | <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | 71 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> |
| 55 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | 72 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> |
| 56 | </Project> | 73 | </Project> |
diff --git a/src/CSharp.Build.props b/src/Directory.csproj.props index 81d24ad1..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/Directory.csproj.props | |||
diff --git a/src/Cpp.Build.props b/src/Directory.vcxproj.props index 4d2da36f..9ea7071b 100644 --- a/src/Cpp.Build.props +++ b/src/Directory.vcxproj.props | |||
| @@ -10,6 +10,9 @@ | |||
| 10 | <!-- NBGV properties --> | 10 | <!-- NBGV properties --> |
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | 11 | <AssemblyCompany>$(Company)</AssemblyCompany> |
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> |
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 13 | </PropertyGroup> | 16 | </PropertyGroup> |
| 14 | 17 | ||
| 15 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> |
| @@ -17,7 +20,7 @@ | |||
| 17 | </PropertyGroup> | 20 | </PropertyGroup> |
| 18 | 21 | ||
| 19 | <PropertyGroup> | 22 | <PropertyGroup> |
| 20 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | 23 | <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> |
| 21 | </PropertyGroup> | 24 | </PropertyGroup> |
| 22 | 25 | ||
| 23 | <ItemDefinitionGroup> | 26 | <ItemDefinitionGroup> |
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj index 1cfc8c11..2bd7ca80 100644 --- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <PropertyGroup> | 21 | <PropertyGroup> |
| 22 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | ||
| 22 | <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 23 | <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> |
| 23 | <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 24 | <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> |
| 24 | </PropertyGroup> | 25 | </PropertyGroup> |
| @@ -27,7 +28,7 @@ | |||
| 27 | <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | 28 | <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> |
| 28 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | 29 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> |
| 29 | </MSBuild> | 30 | </MSBuild> |
| 30 | 31 | ||
| 31 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> | 32 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> |
| 32 | 33 | ||
| 33 | <ItemGroup> | 34 | <ItemGroup> |
| @@ -55,11 +56,4 @@ | |||
| 55 | <FileWrites Include="@(_NCrunchNativeCopied)" /> | 56 | <FileWrites Include="@(_NCrunchNativeCopied)" /> |
| 56 | </ItemGroup> | 57 | </ItemGroup> |
| 57 | </Target> | 58 | </Target> |
| 58 | 59 | </Project> | |
| 59 | <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion"> | ||
| 60 | <PropertyGroup> | ||
| 61 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | ||
| 62 | <NuspecProperties>Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties> | ||
| 63 | </PropertyGroup> | ||
| 64 | </Target> | ||
| 65 | </Project> \ No newline at end of file | ||
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index 73153d5e..ab33f159 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | <PlatformToolset>v142</PlatformToolset> | 39 | <PlatformToolset>v142</PlatformToolset> |
| 40 | <CharacterSet>MultiByte</CharacterSet> | 40 | <CharacterSet>MultiByte</CharacterSet> |
| 41 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> | 41 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> |
| 42 | <PackageId>WixToolset.BalUtil</PackageId> | ||
| 42 | </PropertyGroup> | 43 | </PropertyGroup> |
| 43 | 44 | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| @@ -88,11 +89,6 @@ | |||
| 88 | <None Include="packages.config" /> | 89 | <None Include="packages.config" /> |
| 89 | </ItemGroup> | 90 | </ItemGroup> |
| 90 | 91 | ||
| 91 | <Target Name="Pack" | ||
| 92 | DependsOnTargets="GetBuildVersion"> | ||
| 93 | <Exec Command='nuget pack balutil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.BalUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' /> | ||
| 94 | </Target> | ||
| 95 | |||
| 96 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 92 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 97 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 93 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 98 | <PropertyGroup> | 94 | <PropertyGroup> |
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj index b3ce96ba..b9334cf3 100644 --- a/src/bextutil/bextutil.vcxproj +++ b/src/bextutil/bextutil.vcxproj | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | <PlatformToolset>v142</PlatformToolset> | 39 | <PlatformToolset>v142</PlatformToolset> |
| 40 | <CharacterSet>MultiByte</CharacterSet> | 40 | <CharacterSet>MultiByte</CharacterSet> |
| 41 | <Description>WiX Toolset Bundle Extension native utility library</Description> | 41 | <Description>WiX Toolset Bundle Extension native utility library</Description> |
| 42 | <PackageId>WixToolset.BextUtil</PackageId> | ||
| 42 | </PropertyGroup> | 43 | </PropertyGroup> |
| 43 | 44 | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| @@ -77,11 +78,6 @@ | |||
| 77 | <None Include="packages.config" /> | 78 | <None Include="packages.config" /> |
| 78 | </ItemGroup> | 79 | </ItemGroup> |
| 79 | 80 | ||
| 80 | <Target Name="Pack" | ||
| 81 | DependsOnTargets="GetBuildVersion"> | ||
| 82 | <Exec Command='nuget pack bextutil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.BextUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' /> | ||
| 83 | </Target> | ||
| 84 | |||
| 85 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 81 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 86 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 82 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 87 | <PropertyGroup> | 83 | <PropertyGroup> |
diff --git a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index b7bbd77d..d3a81e2a 100644 --- a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 24 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 25 | <CharacterSet>Unicode</CharacterSet> | 25 | <CharacterSet>Unicode</CharacterSet> |
| 26 | <CLRSupport>true</CLRSupport> | 26 | <CLRSupport>true</CLRSupport> |
| 27 | <SignOutput>false</SignOutput> | ||
| 27 | </PropertyGroup> | 28 | </PropertyGroup> |
| 28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
diff --git a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index f45b9b83..a9937894 100644 --- a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 24 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 25 | <CharacterSet>Unicode</CharacterSet> | 25 | <CharacterSet>Unicode</CharacterSet> |
| 26 | <CLRSupport>true</CLRSupport> | 26 | <CLRSupport>true</CLRSupport> |
| 27 | <SignOutput>false</SignOutput> | ||
| 27 | </PropertyGroup> | 28 | </PropertyGroup> |
| 28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj index 9d9b9c2b..53d82f7e 100644 --- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> | 8 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |