@joebigelow / wix-1 / commits / bd595d0b

Use proper way to pack without building.

Sean Hall committed Jan 2, 2021 at 16:00 UTC bd595d0beca939387b3639eb938a4810e53a8338
3 files changed +5 -5
appveyor.cmd
+2 -2
@@ -10,8 +10,8 @@ msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b
10 dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
11 dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b
12
13 -msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
14 -msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
13 +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
14 +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
15
16 @popd
17 @endlocal
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1 -1
@@ -45,7 +45,7 @@
45 </ItemGroup>
46 </Target>
47
48 - <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
48 + <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
49 <PropertyGroup>
50 <NuspecBasePath>$(OutputPath)</NuspecBasePath>
51 <NuspecProperties>Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties>
src/wixext/WixToolset.Bal.wixext.csproj
+2 -2
@@ -23,14 +23,14 @@
23 </ItemGroup>
24
25 <ItemGroup>
26 - <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' and '$(SkipReferencesToPack)'!='true' " />
26 + <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
27 </ItemGroup>
28
29 <ItemGroup>
30 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
31 </ItemGroup>
32
33 - <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
33 + <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
34 <PropertyGroup>
35 <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
36 <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>