6 files changed, 36 insertions, 14 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f83cc154..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,8 +22,6 @@
     <Product>WiX Toolset</Product>
   </PropertyGroup>
 
-  <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
-  <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
-  <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
   <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index cb988931..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -10,11 +10,6 @@
 -->
 <Project>
   <PropertyGroup>
-    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
-    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <ReplacePackageReferences>true</ReplacePackageReferences>
     <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
     <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
@@ -45,12 +40,12 @@
         <ProjectReference  Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
 
         <!-- Remove the package references that are now referenced as projects -->
-        <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
+        <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
       </ItemGroup>
 
     </When>
   </Choose>
 
-  <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
   <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
 </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/Directory.csproj.targets b/src/Directory.csproj.targets
new file mode 100644
index 00000000..c3270426
--- /dev/null
+++ b/src/Directory.csproj.targets
@@ -0,0 +1,26 @@
+<!-- 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\Directory.csproj.targets
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
+          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
+    <PropertyGroup>
+      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
+
+      <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+      <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
+      <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
+      <PublishRepositoryUrl>true</PublishRepositoryUrl>
+      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
+  </Target>
+
+</Project>
diff --git a/src/Cpp.Build.props b/src/Directory.vcxproj.props
index e7bba117..11778f41 100644
--- a/src/Cpp.Build.props
+++ b/src/Directory.vcxproj.props
@@ -10,6 +10,9 @@
     <!-- NBGV properties -->
     <AssemblyCompany>$(Company)</AssemblyCompany>
     <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
+
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec
index bf9e6fc2..43d461e7 100644
--- a/src/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/wixext/WixToolset.Util.wixext.nuspec
@@ -3,14 +3,13 @@
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
     <authors>$authors$</authors>
-    <owners>$authors$</owners>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/Util.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>$title$</title>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
@@ -20,6 +19,7 @@
     <file src="netstandard2.0\$id$.dll" target="tools" />
 
     <file src="ARM64\*.pdb" target="pdbs\ARM64" />
+    <file src="Win32\*.pdb" target="pdbs\Win32" />
     <file src="x86\*.pdb" target="pdbs\x86" />
     <file src="x64\*.pdb" target="pdbs\x64" />
   </files>