Update dependencies.
Sean Hall committed
Jan 3, 2021 at 14:55 UTC
a46b1cf9bd6f7dfca72b238a1bb1c838dde558ae
9 files changed
+39
-5
Util.wixext.sln
+3
@@ -29,6 +29,7 @@ Global
29
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32
30
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32
31
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32
32
+ {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.Build.0 = Release|Win32
33
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32
34
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32
35
{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32
@@ -38,6 +39,7 @@ Global
39
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32
40
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32
41
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.ActiveCfg = Release|Win32
42
+ {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.Build.0 = Release|Win32
43
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x64.ActiveCfg = Release|Win32
44
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32
45
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32
@@ -47,6 +49,7 @@ Global
49
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86
50
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86
51
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86
52
+ {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86
53
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86
54
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86
55
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86
appveyor.cmd
+2
-3
@@ -3,12 +3,11 @@
3
4
nuget restore || exit /b
5
6
-msbuild -p:Configuration=Release -t:Restore || exit /b
6
+msbuild -p:Configuration=Release -Restore || exit /b
7
8
-msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
8
dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b
9
11
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
10
+msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
11
12
@popd
13
@endlocal
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0171"
3
+ "WixToolset.Sdk": "4.0.0-build-0176"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/CSharp.Build.props
+2
@@ -5,7 +5,9 @@
5
-->
6
<Project>
7
<PropertyGroup>
8
+ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9
<SignAssembly>true</SignAssembly>
10
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11
+ <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12
</PropertyGroup>
13
</Project>
src/Cpp.Build.props
+8
@@ -6,12 +6,20 @@
6
<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
+
10
+ <!-- NBGV properties -->
11
+ <AssemblyCompany>$(Company)</AssemblyCompany>
12
+ <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13
</PropertyGroup>
14
15
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
16
<WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
17
</PropertyGroup>
18
19
+ <PropertyGroup>
20
+ <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
21
+ </PropertyGroup>
22
+
23
<ItemDefinitionGroup>
24
<ClCompile>
25
<DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
src/CustomizedNativeRecommendedRules.ruleset
new
+8
@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0">
3
+ <Include Path="nativerecommendedrules.ruleset" Action="Default" />
4
+ <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
5
+ <!-- We need C style enums since we support BAs written in C -->
6
+ <Rule Id="C26812" Action="None" />
7
+ </Rules>
8
+</RuleSet>
\ No newline at end of file
src/Directory.Build.targets
+8
@@ -9,6 +9,11 @@
9
See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10
-->
11
<Project>
12
+ <PropertyGroup>
13
+ <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14
+ <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15
+ </PropertyGroup>
16
+
17
<PropertyGroup>
18
<ReplacePackageReferences>true</ReplacePackageReferences>
19
<TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
50
51
</When>
52
</Choose>
53
+
54
+ <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
55
+ <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
56
</Project>
src/wixext/WixToolset.Util.wixext.csproj
+1
-1
@@ -32,7 +32,7 @@
32
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
33
</ItemGroup>
34
35
- <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
35
+ <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
36
<PropertyGroup>
37
<NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
38
<NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
src/wixlib/util.wixproj
+6
@@ -25,4 +25,10 @@
25
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
26
</ItemGroup>
27
28
+ <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
29
+ <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
30
+ <PropertyGroup>
31
+ <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
32
+ </PropertyGroup>
33
+ </Target>
34
</Project>