diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-03 13:14:38 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-03 13:49:20 -0800 |
| commit | f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b (patch) | |
| tree | a8a5dc64f17525ad84ea4b6e4204feb0b92deb38 /src/wixext | |
| parent | 0cce08ec250a53f28c2b349b8d88d3d9ea7def9c (diff) | |
| download | wix-f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b.tar.gz wix-f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b.tar.bz2 wix-f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b.zip | |
Update to latest build infrastructure
Diffstat (limited to 'src/wixext')
| -rw-r--r-- | src/wixext/WixToolset.Util.wixext.csproj | 10 | ||||
| -rw-r--r-- | src/wixext/WixToolset.Util.wixext.nuspec | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index b90c9035..10fc569e 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj | |||
| @@ -8,13 +8,10 @@ | |||
| 8 | <Description>WiX Toolset Utility Extension</Description> | 8 | <Description>WiX Toolset Utility Extension</Description> |
| 9 | <Title>WiX Toolset Util Extension</Title> | 9 | <Title>WiX Toolset Util Extension</Title> |
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | ||
| 12 | <IncludeSymbols>true</IncludeSymbols> | 11 | <IncludeSymbols>true</IncludeSymbols> |
| 13 | <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 14 | </PropertyGroup> | 12 | </PropertyGroup> |
| 15 | 13 | ||
| 16 | <ItemGroup> | 14 | <ItemGroup> |
| 17 | <Content Include="$(MSBuildThisFileName).targets" /> | ||
| 18 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> |
| 19 | </ItemGroup> | 16 | </ItemGroup> |
| 20 | 17 | ||
| @@ -31,11 +28,4 @@ | |||
| 31 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | 28 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> |
| 32 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> |
| 33 | </ItemGroup> | 30 | </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> | 31 | </Project> |
diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec index 43d461e7..ba3eaade 100644 --- a/src/wixext/WixToolset.Util.wixext.nuspec +++ b/src/wixext/WixToolset.Util.wixext.nuspec | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> |
| 22 | <file src="Win32\*.pdb" target="pdbs\Win32" /> | ||
| 23 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="x86\*.pdb" target="pdbs\x86" /> |
| 24 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="x64\*.pdb" target="pdbs\x64" /> |
| 25 | </files> | 24 | </files> |