diff options
author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-01 21:30:16 +0300 |
---|---|---|
committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-01 21:30:16 +0300 |
commit | ea0cc674b8116a10c18c2879390c39ec08df8020 (patch) | |
tree | 0e44817e176b10d52a3b86643acd2b5df9951cc3 /Packaging.props | |
parent | b9a615433b4093ff3326adf6bcdf20333fcc025c (diff) | |
parent | 022a8c2088582c3175e7aee4ad4c97c3cea58a28 (diff) |
Merge remote-tracking branch 'upstream/master' into dev/api
Diffstat (limited to 'Packaging.props')
-rw-r--r-- | Packaging.props | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Packaging.props b/Packaging.props index 11a54d01bf..a7f40068a0 100644 --- a/Packaging.props +++ b/Packaging.props @@ -19,6 +19,9 @@ <!-- temporary change until buildtools can be updated https://github.com/dotnet/buildtools/issues/831 --> <LineupPackageVersion Condition="'$(LineupPackageVersion)' == ''">1.0.3</LineupPackageVersion> <PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">1.0.2</PlatformPackageVersion> + + <!-- by default all packages will use the same version which revs with respect to product version --> + <PackageVersion Condition="'$(PackageVersion)' == ''">4.3.0</PackageVersion> <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework> </PropertyGroup> @@ -36,11 +39,11 @@ <!-- Add required legal files to packages --> <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'"> <File Condition="Exists('$(PackageLicenseFile)')" - Include="$(PackageLicenseFile)" > + Include="$(PackageLicenseFile)" > <SkipPackageFileCheck>true</SkipPackageFileCheck> </File> <File Condition="Exists('$(PackageThirdPartyNoticesFile)')" - Include="$(PackageThirdPartyNoticesFile)" > + Include="$(PackageThirdPartyNoticesFile)" > <SkipPackageFileCheck>true</SkipPackageFileCheck> </File> </ItemGroup> |