From df3a3eba860a853495579bdb32ec6e00aa7a67f2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 3 Jan 2021 15:25:43 -0600
Subject: Update dependencies.

---
 src/Cpp.Build.props                          |  8 ++++++++
 src/CustomizedNativeRecommendedRules.ruleset |  8 ++++++++
 src/wixext/WixToolset.Netfx.wixext.csproj    | 15 ++++++++++++---
 src/wixext/WixToolset.Netfx.wixext.nuspec    | 26 ++++++++++++++++++++++++++
 src/wixlib/netfx.wixproj                     |  6 ++++++
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/CustomizedNativeRecommendedRules.ruleset
 create mode 100644 src/wixext/WixToolset.Netfx.wixext.nuspec

(limited to 'src')

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 9b7a1bb5..e7bba117 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -6,12 +6,20 @@
     <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
     <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
+
+    <!-- NBGV properties -->
+    <AssemblyCompany>$(Company)</AssemblyCompany>
+    <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
     <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset
new file mode 100644
index 00000000..142b141c
--- /dev/null
+++ b/src/CustomizedNativeRecommendedRules.ruleset
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0">
+  <Include Path="nativerecommendedrules.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+    <!-- We need C style enums since we support BAs written in C -->
+    <Rule Id="C26812" Action="None" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/wixext/WixToolset.Netfx.wixext.csproj b/src/wixext/WixToolset.Netfx.wixext.csproj
index 725b9c39..2e59f0c4 100644
--- a/src/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/wixext/WixToolset.Netfx.wixext.csproj
@@ -7,9 +7,10 @@
     <RootNamespace>WixToolset.Netfx</RootNamespace>
     <Description>WiX Toolset .NET Framework Extension</Description>
     <Title>WiX Toolset .NET Framework Extension</Title>
-    <IsTool>true</IsTool>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <ContentTargetFolders>build</ContentTargetFolders>
+    <DebugType>embedded</DebugType>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
     <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
   </ItemGroup>
@@ -29,4 +31,11 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
   </ItemGroup>
+
+  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
+    <PropertyGroup>
+      <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
+      <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
 </Project>
diff --git a/src/wixext/WixToolset.Netfx.wixext.nuspec b/src/wixext/WixToolset.Netfx.wixext.nuspec
new file mode 100644
index 00000000..280ccad5
--- /dev/null
+++ b/src/wixext/WixToolset.Netfx.wixext.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/Netfx.wixext</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <title>$title$</title>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$$id$.targets" target="build" />
+
+    <file src="netstandard2.0\$id$.dll" target="tools" />
+
+    <file src="ARM64\*.pdb" target="pdbs\ARM64" />
+    <file src="x86\*.pdb" target="pdbs\x86" />
+    <file src="x64\*.pdb" target="pdbs\x64" />
+  </files>
+</package>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 8ee73326..efe66e8e 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -27,4 +27,10 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
   </ItemGroup>
 
+  <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
+  <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
+    <PropertyGroup>
+      <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
+    </PropertyGroup>
+  </Target>
 </Project>
-- 
cgit v1.2.3-55-g6feb