diff options
author | Rob Mensching <rob@firegiant.com> | 2021-12-21 12:44:27 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-12-30 08:15:54 -0800 |
commit | 4cd4828e6225a2ff5e81002a7f6f7401570b21c4 (patch) | |
tree | 54acd62489f52661881372b6d22bf6e670017ef2 /src/internal/SetBuildNumber | |
parent | 6d431a1488f770a0c2c753e2e3744fbb8d3eee0b (diff) | |
download | wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.gz wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.bz2 wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.zip |
Build simplification and parallelization
Diffstat (limited to 'src/internal/SetBuildNumber')
-rw-r--r-- | src/internal/SetBuildNumber/Directory.Packages.props.pp | 4 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/global.json.pp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index ff73265c..4743fb2e 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp | |||
@@ -50,11 +50,11 @@ | |||
50 | <PackageVersion Include="NuGet.Versioning" Version="5.6.0" /> | 50 | <PackageVersion Include="NuGet.Versioning" Version="5.6.0" /> |
51 | </ItemGroup> | 51 | </ItemGroup> |
52 | 52 | ||
53 | <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" > | 53 | <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" > |
54 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> | 54 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> |
55 | </ItemGroup> | 55 | </ItemGroup> |
56 | 56 | ||
57 | <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netcoreapp3.1'"> | 57 | <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> |
58 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> | 58 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> |
59 | </ItemGroup> | 59 | </ItemGroup> |
60 | 60 | ||
diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp index a1d6244a..5907efb0 100644 --- a/src/internal/SetBuildNumber/global.json.pp +++ b/src/internal/SetBuildNumber/global.json.pp | |||
@@ -1,5 +1,6 @@ | |||
1 | { | 1 | { |
2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
3 | "Microsoft.Build.Traversal": "3.0.23", | ||
3 | "WixToolset.Sdk": "{packageversion}" | 4 | "WixToolset.Sdk": "{packageversion}" |
4 | }, | 5 | }, |
5 | "sdk": { | 6 | "sdk": { |