Runtime pack resolution #19596

dsplaisted · 2021-08-09T16:35:08Z

Resolves runtime packs from packs directory if present
Supports using DOTNETSDK_WORKLOAD_PACK_ROOTS environment variable to set additional packs folders for targeting and runtime packs
- The packs should be under a packs subfolder of the directory specified by the environment variable
Supports resolving targeting or runtime pack versions from workload manifest
- To use this, the version in the KnownFrameworkReference or KnownRuntimePack item should be set to **FromWorkload**

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

joeloff · 2021-08-10T23:29:01Z

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

+                {
+                    yield return TargetingPackRoot;
+                }
+                var packRootEnvironmentVariable = Environment.GetEnvironmentVariable("DOTNETSDK_WORKLOAD_PACK_ROOTS");


Do we have a central class where we can keep all these environmental variable constants? That way we don't need to worry about typo's in the code.

Thank you. I think this will save us a lot of potential pain in the future

I've added one now (EnvironmentVariableNames) and added constants for the workload environment variables. There are a bunch of other CLI environment variables which I didn't refactor into this class yet.

…anifests

dsplaisted · 2021-08-12T04:16:52Z

@joeloff I've updated this PR to apply your feedback and also to now address #18064. So a re-review would be good :-)

joeloff · 2021-08-12T04:35:16Z

@joeloff I've updated this PR to apply your feedback and also to now address #18064. So a re-review would be good :-)

I'll take another pass tonight

joeloff · 2021-08-12T05:34:16Z

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

+
+        private string GetResolvedPackVersion(string packID, string packVersion)
+        {
+            if (!packVersion.Equals("**FromWorload**", StringComparison.OrdinalIgnoreCase))


Should be "FromWorkload"?

Oops! Thanks for catching that :-)

joeloff · 2021-08-12T05:35:53Z

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

+                          DefaultRuntimeFrameworkVersion='**FromWorload**'
+                          LatestRuntimeFrameworkVersion='**FromWorload**'
+                          TargetingPackName='Microsoft.NETCore.App.Test.Ref'
+                          TargetingPackVersion='**FromWorload**'


Looks like a typo - should be FromWorkload?

joeloff · 2021-08-12T05:59:20Z

I think this looks good.

KalleOlaviNiemitalo · 2021-08-12T12:44:13Z

src/Tasks/Common/Resources/xlf/Strings.ja.xlf~RF1ea49cc.TMP

@@ -0,0 +1,914 @@
+<?xml version="1.0" encoding="utf-8"?>


src/Tasks/Common/Resources/xlf/Strings.ja.xlf~RF1ea49cc.TMP looks like a name for a temporary file; did you add this by accident?

There is the older Strings.es.xlf~RF13d378ed.TMP as well.

Yeah this looks like a mistake, filed #19688 to delete them.

Thanks for catching that. I've submitted #19694 to fix.

Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of the Android workload. You can simply do: ~/android-toolchain/dotnet/dotnet new android ~/android-toolchain/dotnet/dotnet build

mhutch · 2021-08-13T18:01:32Z

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

+            var packInfo = _workloadResolver.TryGetPackInfo(new WorkloadPackId(packID));
+            if (packInfo == null)
+            {
+                Log.LogError("NETSDKZZZZ: Error getting pack version: Pack '{0}' was not present in workload manifests.", packID);


Placeholder error code?

…6184) Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of the Android workload. You can simply do: ~/android-toolchain/dotnet/dotnet new android ~/android-toolchain/dotnet/dotnet build

Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file for projects when you have the `maui` workload installed. One caveat for dotnet/maui is we have a `$(MicrosoftMauiSdkVersion)`. We'll need to use `**FromWorkload**` in some places, and the actual number when declaring `@(PackageReference)`.

Context: dotnet/sdk#19596 Context: dotnet/android#6184 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of the xamarin-macios. You will no longer need a feed such as: <add key="local-dotnet-feed" value="~/src/xamarin-macios/_build/nuget-feed" />

Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file for projects when you have the `maui` workload installed. One caveat for dotnet/maui is we have a `$(MicrosoftMauiSdkVersion)`. We'll need to use `**FromWorkload**` in some places, and the actual number when declaring `@(PackageReference)`.

Context: dotnet/sdk#19596 Context: dotnet/android#6184 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of the xamarin-macios. You will no longer need a feed such as: <add key="local-dotnet-feed" value="~/src/xamarin-macios/_build/nuget-feed" />

Context: dotnet/sdk#19596 Context: dotnet/android#6184 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of the xamarin-macios. You will no longer need a feed such as: <add key="local-dotnet-feed" value="~/src/xamarin-macios/_build/nuget-feed" /> To further clean things up, I removed the need for: * Any NuGet feed named `local-dotnet-feed` * `$(DOTNET_FEED_DIR)` * Generation of `dotnet/Workloads/NuGet.config`

…2122) Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file for projects when you have the `maui` workload installed. One caveat for dotnet/maui is we have a `$(MicrosoftMauiSdkVersion)`. We'll need to use `**FromWorkload**` in some places, and the actual number when declaring `@(PackageReference)`.

…2449) Context: dotnet/sdk#19596 Context: dotnet/android#6184 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file when building a .NET 6 app with a local build of xamarin-macios. You will no longer need a feed such as: <add key="local-dotnet-feed" value="~/src/xamarin-macios/_build/nuget-feed" /> To further clean things up, I removed the need for: * Any NuGet feed named `local-dotnet-feed` * `$(DOTNET_FEED_DIR)` * Generation of `dotnet/Workloads/NuGet.config`

Context: dotnet/sdk#19596

…#2122) Context: dotnet/sdk#19596 If we use the version number string of `**FromWorkload**`, then our runtime packages don't need to be resolved from a NuGet feed. They can be resolved from the `dotnet/packs` directory. This completely eliminates the need for a `NuGet.config` file for projects when you have the `maui` workload installed. One caveat for dotnet/maui is we have a `$(MicrosoftMauiSdkVersion)`. We'll need to use `**FromWorkload**` in some places, and the actual number when declaring `@(PackageReference)`.

dsplaisted requested a review from a team August 9, 2021 16:35

dotnet-issue-labeler bot added the Area-Workloads label Aug 9, 2021

dsplaisted requested review from wli3, sfoslund, marcpopMSFT and joeloff August 9, 2021 16:36

dsplaisted added 4 commits August 10, 2021 11:41

Resolve runtime packs from packs directory if present

e3bf968

Use DOTNETSDK_WORKLOAD_PACK_ROOTS for targeting and runtime packs

890cf80

Support multiple AdditionalItems of same type in TestProject

ae8b175

Add test for resolving runtime packs from packs folder

d975185

dsplaisted force-pushed the runtime-pack-resolution branch from 4de5b38 to d975185 Compare August 10, 2021 18:41

dsplaisted mentioned this pull request Aug 10, 2021

Update implicit global usings feature #19599

Merged

Fix test running with older Roslyn

2a8818a

joeloff reviewed Aug 10, 2021

View reviewed changes

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs Show resolved Hide resolved

joeloff reviewed Aug 10, 2021

View reviewed changes

dsplaisted added 2 commits August 11, 2021 18:08

Factor environment variable names into central constants

966dbd8

Support resolving runtime and targeting pack versions from workload m…

0b47c8d

…anifests

joeloff approved these changes Aug 12, 2021

View reviewed changes

Add test for resolving pack versions from workload manifests

3f30706

joeloff reviewed Aug 12, 2021

View reviewed changes

Fix typo

db5e1d6

dsplaisted enabled auto-merge August 12, 2021 06:19

dsplaisted merged commit 865fdb6 into dotnet:main Aug 12, 2021

KalleOlaviNiemitalo reviewed Aug 12, 2021

View reviewed changes

dsplaisted mentioned this pull request Aug 13, 2021

Cache results of ResolveTargetingPackAssets across builds #19570

Merged

jonathanpeppers mentioned this pull request Aug 13, 2021

[One .NET] use **FromWorkload** for targeting/runtime pack versions dotnet/android#6184

Merged

mhutch reviewed Aug 13, 2021

View reviewed changes

jonathanpeppers mentioned this pull request Aug 16, 2021

[workload] use **FromWorkload** for targeting/runtime pack versions dotnet/maui#2122

Merged

12 tasks

jonathanpeppers mentioned this pull request Aug 16, 2021

[dotnet] use **FromWorkload** for targeting/runtime pack versions xamarin/xamarin-macios#12449

Merged

WonyoungChoi added a commit to Samsung/Tizen.NET that referenced this pull request Aug 27, 2021

Use **FromWorkload** for targeting version

2c631cd

Context: dotnet/sdk#19596

dsplaisted mentioned this pull request Jul 31, 2022

[workloads] Keeping workload updates compatible with older runtime versions dotnet/runtime#53621

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Runtime pack resolution #19596

Runtime pack resolution #19596

dsplaisted commented Aug 9, 2021 •

edited

Loading

joeloff Aug 10, 2021

joeloff Aug 12, 2021

dsplaisted Aug 12, 2021

dsplaisted commented Aug 12, 2021

joeloff commented Aug 12, 2021

joeloff Aug 12, 2021

dsplaisted Aug 12, 2021

joeloff Aug 12, 2021

joeloff commented Aug 12, 2021

KalleOlaviNiemitalo Aug 12, 2021

akoeplinger Aug 12, 2021

dsplaisted Aug 12, 2021

mhutch Aug 13, 2021

Runtime pack resolution #19596

Runtime pack resolution #19596

Conversation

dsplaisted commented Aug 9, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dsplaisted commented Aug 12, 2021

joeloff commented Aug 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joeloff commented Aug 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dsplaisted commented Aug 9, 2021 •

edited

Loading