Skip to content

Commit 1a1d48d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime (#17948)
[main] Update dependencies from dotnet/runtime - Fix issue where ASP.NET tests or tools could run on Stage 0 Microsoft.NETCore.App shared framework - Fix dependency context test
1 parent 58cbf4f commit 1a1d48d

File tree

8 files changed

+145
-44
lines changed

8 files changed

+145
-44
lines changed

‎Directory.Build.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@
4545
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
4646
</ItemGroup>
4747

48+
<Import Project="src\Layout\redist\targets\BuildToolsetTasks.targets" Condition="'$(MSBuildProjectName)' != 'toolset-tasks'"/>
49+
50+
51+
4852
</Project>

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,37 @@
2525
<Uri>https://github.com/dotnet/templating</Uri>
2626
<Sha>9be5658cb9db8b49900785094d7545214479dc34</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21276.13">
28+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21281.1">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
30+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
3131
</Dependency>
32-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21276.13">
32+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21281.1">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
34+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21276.13">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21281.1">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
38+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.6.21276.13">
40+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.6.21281.1">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
42+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21276.13">
44+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21281.1">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
46+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.6.21276.13">
48+
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.6.21281.1">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
50+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21276.13">
52+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21281.1">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
54+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.6.21276.13">
56+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.6.21281.1">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
58+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
5959
</Dependency>
6060
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21279-04">
6161
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -109,21 +109,21 @@
109109
<Uri>https://github.com/mono/linker</Uri>
110110
<Sha>04e0f49338e416f2e2feebd7804b41aa8e24d841</Sha>
111111
</Dependency>
112-
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21276.13">
112+
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21281.1">
113113
<Uri>https://github.com/dotnet/runtime</Uri>
114-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
114+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
115115
</Dependency>
116-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.6.21276.13">
116+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.6.21281.1">
117117
<Uri>https://github.com/dotnet/runtime</Uri>
118-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
118+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
119119
</Dependency>
120-
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21276.13">
120+
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21281.1">
121121
<Uri>https://github.com/dotnet/runtime</Uri>
122-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
122+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
123123
</Dependency>
124-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21276.13">
124+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21281.1">
125125
<Uri>https://github.com/dotnet/runtime</Uri>
126-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
126+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
127127
</Dependency>
128128
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21280.3">
129129
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -220,9 +220,9 @@
220220
<Uri>https://github.com/dotnet/arcade</Uri>
221221
<Sha>b5ca0997b26992dcc4e55ec3d87d71000be295ce</Sha>
222222
</Dependency>
223-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21276.13">
223+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21281.1">
224224
<Uri>https://github.com/dotnet/runtime</Uri>
225-
<Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
225+
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
226226
</Dependency>
227227
</ToolsetDependencies>
228228
</Dependencies>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@
3131
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
3232
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21278.1</MicrosoftDotNetSignToolVersion>
3333
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
34-
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.6.21276.13</SystemSecurityCryptographyProtectedDataPackageVersion>
34+
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.6.21281.1</SystemSecurityCryptographyProtectedDataPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3737
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3838
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
39-
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21276.13</SystemReflectionMetadataLoadContextVersion>
39+
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21281.1</SystemReflectionMetadataLoadContextVersion>
4040
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
4141
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4242
</PropertyGroup>
4343
<PropertyGroup>
4444
<!-- Dependencies from https://github.com/dotnet/runtime -->
45-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21276.13</MicrosoftNETCoreAppRefPackageVersion>
46-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21276.13</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.6.21276.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
45+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21281.1</MicrosoftNETCoreAppRefPackageVersion>
46+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21281.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.6.21281.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4848
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
49-
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.6.21276.13</MicrosoftExtensionsDependencyModelPackageVersion>
50-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.6.21276.13</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51-
<MicrosoftNETHostModelVersion>6.0.0-preview.6.21276.13</MicrosoftNETHostModelVersion>
49+
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.6.21281.1</MicrosoftExtensionsDependencyModelPackageVersion>
50+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.6.21281.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51+
<MicrosoftNETHostModelVersion>6.0.0-preview.6.21281.1</MicrosoftNETHostModelVersion>
5252
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
5353
</PropertyGroup>
5454
<PropertyGroup>
@@ -80,10 +80,10 @@
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependencies from https://github.com/dotnet/runtime -->
83-
<SystemCodeDomPackageVersion>6.0.0-preview.6.21276.13</SystemCodeDomPackageVersion>
84-
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.6.21276.13</SystemTextEncodingCodePagesPackageVersion>
83+
<SystemCodeDomPackageVersion>6.0.0-preview.6.21281.1</SystemCodeDomPackageVersion>
84+
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.6.21281.1</SystemTextEncodingCodePagesPackageVersion>
8585
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
86-
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21276.13</SystemResourcesExtensionsPackageVersion>
86+
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21281.1</SystemResourcesExtensionsPackageVersion>
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

‎src/Assets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
11+
<!-- .NET 6 versions of this package no longer support .NET Core 2.2, so hard-code the version here to 5.0 -->
12+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
1213
</ItemGroup>
1314

1415
</Project>

‎src/Layout/redist/redist.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<EnableNETAnalyzers>false</EnableNETAnalyzers>
1212
</PropertyGroup>
1313

14-
<Import Project="targets\BuildToolsetTasks.targets" />
14+
<!-- This is currently imported in Directory.Build.targets -->
15+
<!--<Import Project="targets\BuildToolsetTasks.targets" />-->
16+
1517
<Import Project="targets\GetRuntimeInformation.targets" />
1618
<Import Project="targets\Version.targets" />
1719
<Import Project="targets\BundledSdks.targets" />

‎src/Layout/redist/targets/BuildToolsetTasks.targets‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,28 @@
44
<TaskTargetFramework>$(SdkTargetFramework)</TaskTargetFramework>
55
<TaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</TaskTargetFramework>
66

7-
<ToolsetTaskDll>$(ArtifactsDir)tasks\bin\toolset-tasks\$(Configuration)\$(TaskTargetFramework)\toolset-tasks.dll</ToolsetTaskDll>
7+
<!--<ToolsetTaskDll>$(ArtifactsDir)tasks\bin\toolset-tasks\$(Configuration)\$(TaskTargetFramework)\toolset-tasks.dll</ToolsetTaskDll>-->
8+
<ToolsetTaskDll>$(ArtifactsDir)bin\toolset-tasks\$(Configuration)\$(TaskTargetFramework)\toolset-tasks.dll</ToolsetTaskDll>
89
<ToolsetTaskProject>$(RepoRoot)src\Layout\toolset-tasks\toolset-tasks.csproj</ToolsetTaskProject>
910
</PropertyGroup>
10-
<Target Name="BuildCoreSdkTasks" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
11-
<!-- Use a different ArtifactsDir for this invocation so that the tasks project can be part of the solution
12-
(for easy editing), but we don't hit problems with the tasks DLL being locked when we try to build the solution. -->
11+
12+
<!-- Right now we're using these tasks in all projects, so we build with a ProjectReference. Once https://github.com/dotnet/sdk/pull/17982
13+
is merged and flows through to stage 0, we can delete the PatchRuntimeConfig target and go back to the way it was. -->
14+
<ItemGroup>
15+
<ProjectReference Include="$(ToolsetTaskProject)" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" SetTargetFramework="TargetFramework=$(TaskTargetFramework)" />
16+
</ItemGroup>
17+
18+
<!--<Target Name="BuildCoreSdkTasks" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
19+
--><!-- Use a different ArtifactsDir for this invocation so that the tasks project can be part of the solution
20+
(for easy editing), but we don't hit problems with the tasks DLL being locked when we try to build the solution. --><!--
1321
1422
<MSBuild Projects="$(ToolsetTaskProject)"
1523
Properties="ArtifactsDir=$(ArtifactsDir)tasks\;Phase=Restore"
1624
Targets="Restore"/>
1725
1826
<MSBuild Projects="$(ToolsetTaskProject)"
1927
Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/>
20-
</Target>
28+
</Target>-->
2129

2230
<UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(ToolsetTaskDll)" />
2331
<UsingTask TaskName="Chmod" AssemblyFile="$(ToolsetTaskDll)" />
@@ -26,5 +34,20 @@
2634
<UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(ToolsetTaskDll)"/>
2735
<UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsetTaskDll)"/>
2836
<UsingTask TaskName="OverrideAndCreateBundledNETCoreAppPackageVersion" AssemblyFile="$(ToolsetTaskDll)"/>
37+
<UsingTask TaskName="AddBaseFrameworkToRuntimeConfig" AssemblyFile="$(ToolsetTaskDll)"/>
38+
39+
<Target Name="PatchRuntimeConfig" AfterTargets="GenerateBuildRuntimeConfigurationFiles"
40+
Condition="'$(MSBuildProjectName)' != 'toolset-tasks' And '$(MSBuildProjectName)' != 'HelixTasks' And Exists($(ProjectRuntimeConfigFilePath))">
41+
42+
<!-- Currently, GenerateRuntimeConfigurationFiles omits the reference to Microsoft.NETCore.App from the runtimeconfig file when there is a different
43+
shared framework. In this repo, this can cause the tests or tools such as dotnet-watch to use the stage 0 version of Microsoft.NETCore.App
44+
instead of the version specified in Versions.props. This can cause failures when there are changes to the base framework, as we compile against
45+
the one specified in Versions.props, but the project runs against an earlier version.
46+
47+
This task works around this by adding Microsoft.NETCore.App back to the list of runtimes in the runtimeconfig file if it's not there already. -->
48+
49+
<AddBaseFrameworkToRuntimeConfig RuntimeConfigPath="$(ProjectRuntimeConfigFilePath)" MicrosoftNetCoreAppVersion="$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" />
50+
51+
</Target>
2952

3053
</Project>

‎src/Layout/toolset-tasks/AddBaseFrameworkToRuntimeConfig.cs‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
//
4+
5+
using System;
6+
using System.Collections.Generic;
7+
using System.IO;
8+
using System.Linq;
9+
using Microsoft.Build.Framework;
10+
using Microsoft.Build.Utilities;
11+
using Microsoft.NET.Build.Tasks;
12+
using Newtonsoft.Json;
13+
using Newtonsoft.Json.Serialization;
14+
15+
namespace Microsoft.DotNet.Build.Tasks
16+
{
17+
public sealed class AddBaseFrameworkToRuntimeConfig : Task
18+
{
19+
[Required]
20+
public string RuntimeConfigPath { get; set; }
21+
22+
[Required]
23+
public string MicrosoftNetCoreAppVersion { get; set; }
24+
25+
public override bool Execute()
26+
{
27+
JsonSerializer serializer = new JsonSerializer();
28+
serializer.ContractResolver = new CamelCasePropertyNamesContractResolver();
29+
serializer.Formatting = Formatting.Indented;
30+
serializer.DefaultValueHandling = DefaultValueHandling.Ignore;
31+
32+
RuntimeConfig runtimeConfig;
33+
using (var sr = new StreamReader(RuntimeConfigPath))
34+
{
35+
runtimeConfig = serializer.Deserialize<RuntimeConfig>(new JsonTextReader(sr));
36+
}
37+
38+
IEnumerable<RuntimeConfigFramework> currentFrameworks = runtimeConfig.RuntimeOptions.Frameworks ?? Enumerable.Empty<RuntimeConfigFramework>();
39+
if (runtimeConfig.RuntimeOptions.Framework != null)
40+
{
41+
currentFrameworks = currentFrameworks.Prepend(runtimeConfig.RuntimeOptions.Framework);
42+
}
43+
44+
if (!currentFrameworks.Any(f => f.Name.Equals("Microsoft.NETCore.App", StringComparison.OrdinalIgnoreCase)))
45+
{
46+
var newFrameworks = currentFrameworks.Prepend(new RuntimeConfigFramework()
47+
{
48+
Name = "Microsoft.NETCore.App",
49+
Version = MicrosoftNetCoreAppVersion
50+
});
51+
52+
runtimeConfig.RuntimeOptions.Framework = null;
53+
runtimeConfig.RuntimeOptions.Frameworks = newFrameworks.ToList();
54+
55+
using (JsonTextWriter writer = new JsonTextWriter(new StreamWriter(File.Create(RuntimeConfigPath))))
56+
{
57+
serializer.Serialize(writer, runtimeConfig);
58+
}
59+
}
60+
61+
return true;
62+
}
63+
}
64+
}

‎src/Layout/toolset-tasks/toolset-tasks.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
44
<TargetFrameworks Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' ">$(SdkTargetFramework)</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
6+
<RootNamespace>Microsoft.DotNet.Build.Tasks</RootNamespace>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -13,6 +14,12 @@
1314
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
1415
</ItemGroup>
1516

17+
<ItemGroup>
18+
<Compile Include="..\..\Tasks\Microsoft.NET.Build.Tasks\RuntimeConfig.cs" LinkBase="RuntimeConfig"/>
19+
<Compile Include="..\..\Tasks\Microsoft.NET.Build.Tasks\RuntimeOptions.cs" LinkBase="RuntimeConfig"/>
20+
<Compile Include="..\..\Tasks\Microsoft.NET.Build.Tasks\RuntimeConfigFramework.cs" LinkBase="RuntimeConfig"/>
21+
</ItemGroup>
22+
1623
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
1724
<Reference Include="System.Net.Http" />
1825
</ItemGroup>

0 commit comments

Comments
 (0)