Skip to content

Commit bd5d396

Browse files
authored
[build] Version .NET VS manifest file (dotnet#7064)
As part of supporting .NET 6 projects with our .NET 7 workload, we will want to be able to insert both .NET 6 and .NET 7 workload packs into VS. Historically, we have replaced the [VS manifest file][0] every time we update our workload. For .NET 7 we will likely want two VS manifests side by side, one which contains our .NET 6 packs and one for .NET 7. Add a version to the .NET VS manifest file to support this potential side by side scenario. [0]: https://devdiv.visualstudio.com/DevDiv/_git/VS?path=/.corext/Configs/dotnet-workloads-components.json&version=GBmain&line=10&lineEnd=11&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents
1 parent 98821bb commit bd5d396

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build-tools/create-packs/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<ReplaceFileContents
8686
SourceFile="vs-workload.in.props"
8787
DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"
88-
Replacements="@PACK_VERSION_LONG@=$(AndroidPackVersionLong);@PACK_VERSION_SHORT@=$(AndroidMSIVersion);@WORKLOAD_VERSION@=$(AndroidMSIVersion)"
88+
Replacements="@PACK_VERSION_LONG@=$(AndroidPackVersionLong);@PACK_VERSION_SHORT@=$(AndroidMSIVersion);@WORKLOAD_VERSION@=$(AndroidMSIVersion);@VSMAN_VERSION@=$(DotNetTargetFramework)"
8989
/>
9090
</Target>
9191

build-tools/create-packs/vs-workload.in.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<TargetName>Microsoft.NET.Sdk.Android.Workload</TargetName>
4+
<TargetName>Microsoft.NET.Sdk.Android.Workload.@VSMAN_VERSION@</TargetName>
55
<ManifestBuildVersion>@WORKLOAD_VERSION@</ManifestBuildVersion>
66
</PropertyGroup>
77
<ItemGroup>

0 commit comments

Comments
 (0)