diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-02 16:00:28 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-03 16:19:55 -0600 |
| commit | bd595d0beca939387b3639eb938a4810e53a8338 (patch) | |
| tree | 260aa8de00bfd818562f34beb7593cc9b37d4809 | |
| parent | 611bf9ec74426c972b6b271cb51d81e467d990cd (diff) | |
| download | wix-bd595d0beca939387b3639eb938a4810e53a8338.tar.gz wix-bd595d0beca939387b3639eb938a4810e53a8338.tar.bz2 wix-bd595d0beca939387b3639eb938a4810e53a8338.zip | |
Use proper way to pack without building.
| -rw-r--r-- | appveyor.cmd | 4 | ||||
| -rw-r--r-- | src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 | ||||
| -rw-r--r-- | src/wixext/WixToolset.Bal.wixext.csproj | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index b3b08545..f4e9c26e 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
| @@ -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 | 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 | 11 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b |
| 12 | 12 | ||
| 13 | msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.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% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b | 14 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b |
| 15 | 15 | ||
| 16 | @popd | 16 | @popd |
| 17 | @endlocal | 17 | @endlocal |
diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 32d130bd..3ee0ad1e 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | </ItemGroup> | 45 | </ItemGroup> |
| 46 | </Target> | 46 | </Target> |
| 47 | 47 | ||
| 48 | <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion"> | 48 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"> |
| 49 | <PropertyGroup> | 49 | <PropertyGroup> |
| 50 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | 50 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> |
| 51 | <NuspecProperties>Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties> | 51 | <NuspecProperties>Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties> |
diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 6933e62a..00451403 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj | |||
| @@ -23,14 +23,14 @@ | |||
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <ItemGroup> | 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> | 27 | </ItemGroup> |
| 28 | 28 | ||
| 29 | <ItemGroup> | 29 | <ItemGroup> |
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> |
| 31 | </ItemGroup> | 31 | </ItemGroup> |
| 32 | 32 | ||
| 33 | <Target Name="SetNuspecProperties" AfterTargets="CoreBuild"> | 33 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"> |
| 34 | <PropertyGroup> | 34 | <PropertyGroup> |
| 35 | <NuspecBasePath>$(OutputPath)..\</NuspecBasePath> | 35 | <NuspecBasePath>$(OutputPath)..\</NuspecBasePath> |
| 36 | <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> | 36 | <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> |