diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-09-17 15:19:33 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-09-17 15:19:33 -0700 |
| commit | c83079486f01c3b1511108e202ab7f2d65ddf434 (patch) | |
| tree | 6b36549f7a42db52d67cb1e4a0af715d59a36c26 | |
| parent | 3e1c5e3fa80a2498f7d6aac5c0f8ca9e3bd7c66c (diff) | |
| download | wix-c83079486f01c3b1511108e202ab7f2d65ddf434.tar.gz wix-c83079486f01c3b1511108e202ab7f2d65ddf434.tar.bz2 wix-c83079486f01c3b1511108e202ab7f2d65ddf434.zip | |
Update to latest GitVersioning and Directory.Build.props standards
| -rw-r--r-- | src/Directory.Build.props | 4 | ||||
| -rw-r--r-- | src/WixToolset.Extensibility/WixToolset.Extensibility.csproj | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0ea54cfe..25cb6d36 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | 7 | <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> |
| 8 | <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath> | 8 | <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath> |
| 9 | 9 | ||
| 10 | <Authors>Rob Mensching, Bob Arnson</Authors> | 10 | <Authors>WiX Toolset Team</Authors> |
| 11 | <Company>WiX Toolset</Company> | 11 | <Company>WiX Toolset</Company> |
| 12 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | 12 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| @@ -15,4 +15,6 @@ | |||
| 15 | <PropertyGroup> | 15 | <PropertyGroup> |
| 16 | <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> | 16 | <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> |
| 17 | </PropertyGroup> | 17 | </PropertyGroup> |
| 18 | |||
| 19 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 18 | </Project> | 20 | </Project> |
diff --git a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj index 8efae769..a2cb5e26 100644 --- a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj +++ b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj | |||
| @@ -9,9 +9,11 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <!-- <ProjectOrPackageReference Include="$(WixToolsetRootFolder)Data\src\WixToolset.Data\WixToolset.Data.csproj" Version="4.0.*" /> --> | ||
| 13 | <!--<ProjectOrPackageReference Include="WixToolset.Data" Repo="Data" Version="1.0.*" />--> | ||
| 14 | <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " /> | 12 | <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " /> |
| 15 | <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " /> | 13 | <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " /> |
| 16 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | |||
| 16 | <ItemGroup> | ||
| 17 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" /> | ||
| 18 | </ItemGroup> | ||
| 17 | </Project> | 19 | </Project> |