Update dependencies.
Sean Hall committed
Jan 3, 2021 at 15:25 UTC
df3a3eba860a853495579bdb32ec6e00aa7a67f2
8 files changed
+65
-7
NetFx.wixext.sln
+2
@@ -27,6 +27,7 @@ Global
27
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
28
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32
29
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32
30
+ {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32
31
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32
32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
33
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
@@ -36,6 +37,7 @@ Global
37
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.ActiveCfg = Debug|x86
38
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.Build.0 = Debug|x86
39
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.ActiveCfg = Release|x86
40
+ {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.Build.0 = Release|x86
41
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x64.ActiveCfg = Release|x86
42
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.ActiveCfg = Release|x86
43
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.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.Netfx\WixToolsetTest.Netfx.csproj || exit /b
8
dotnet test -c Release --no-build src\test\WixToolsetTest.Netfx || exit /b
9
11
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b
10
+msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b
11
12
@popd
13
@endlocal
\ No newline at end of file
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0175"
3
+ "WixToolset.Sdk": "4.0.0-build-0176"
4
}
5
}
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/wixext/WixToolset.Netfx.wixext.csproj
+12
-3
@@ -7,9 +7,10 @@
7
<RootNamespace>WixToolset.Netfx</RootNamespace>
8
<Description>WiX Toolset .NET Framework Extension</Description>
9
<Title>WiX Toolset .NET Framework Extension</Title>
10
- <IsTool>true</IsTool>
11
- <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
12
- <ContentTargetFolders>build</ContentTargetFolders>
10
+ <DebugType>embedded</DebugType>
11
+ <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12
+ <IncludeSymbols>true</IncludeSymbols>
13
+ <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
14
</PropertyGroup>
15
16
<ItemGroup>
@@ -18,6 +19,7 @@
19
</ItemGroup>
20
21
<ItemGroup>
22
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
23
<PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
24
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
25
</ItemGroup>
@@ -29,4 +31,11 @@
31
<ItemGroup>
32
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
33
</ItemGroup>
34
+
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>
39
+ </PropertyGroup>
40
+ </Target>
41
</Project>
src/wixext/WixToolset.Netfx.wixext.nuspec
new
+26
@@ -0,0 +1,26 @@
1
+<?xml version="1.0"?>
2
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3
+ <metadata minClientVersion="4.0">
4
+ <id>$id$</id>
5
+ <version>$version$</version>
6
+ <authors>$authors$</authors>
7
+ <owners>$authors$</owners>
8
+ <license type="expression">MS-RL</license>
9
+ <projectUrl>https://github.com/wixtoolset/Netfx.wixext</projectUrl>
10
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
11
+ <title>$title$</title>
12
+ <description>$description$</description>
13
+ <copyright>$copyright$</copyright>
14
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15
+ </metadata>
16
+
17
+ <files>
18
+ <file src="$projectFolder$$id$.targets" target="build" />
19
+
20
+ <file src="netstandard2.0\$id$.dll" target="tools" />
21
+
22
+ <file src="ARM64\*.pdb" target="pdbs\ARM64" />
23
+ <file src="x86\*.pdb" target="pdbs\x86" />
24
+ <file src="x64\*.pdb" target="pdbs\x64" />
25
+ </files>
26
+</package>
src/wixlib/netfx.wixproj
+6
@@ -27,4 +27,10 @@
27
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
28
</ItemGroup>
29
30
+ <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
31
+ <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
32
+ <PropertyGroup>
33
+ <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
34
+ </PropertyGroup>
35
+ </Target>
36
</Project>