From c90831d94c8cac6f4ff691564a6b629aae1624dc Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 9 Sep 2021 10:30:07 -0700 Subject: [PATCH] Revert "[release/6.0] React to dotnet/runtime#57816 (#36155)" - was reacting to a change not in our dependencies This reverts commit e58a6c2465a75267083cf95755ea950f7b0ae2c2. --- eng/Dependencies.props | 6 ++++++ eng/Version.Details.xml | 16 ++++++++++++++++ eng/Versions.props | 4 ++++ .../src/Microsoft.AspNetCore.App.Ref.csproj | 8 ++++++++ .../src/Microsoft.AspNetCore.App.Runtime.csproj | 8 ++++++++ 5 files changed, 42 insertions(+) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 4f64075c07cb..b78ad89a9e3a 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -79,6 +79,12 @@ and are generated based on the last package release. + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3727757d3eab..de7a474d88a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,6 +177,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c176936f25b347a3575f736358e4249a85f16536 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 @@ -193,6 +197,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c176936f25b347a3575f736358e4249a85f16536 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 @@ -225,6 +233,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c176936f25b347a3575f736358e4249a85f16536 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 @@ -241,6 +253,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c176936f25b347a3575f736358e4249a85f16536 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c176936f25b347a3575f736358e4249a85f16536 diff --git a/eng/Versions.props b/eng/Versions.props index 09858b221e34..189538f54348 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,10 +105,12 @@ 6.0.0 6.0.0 6.0.0 + 6.0.0 6.0.0-rtm.21426.20 6.0.0 6.0.0 6.0.0 + 6.0.0 6.0.0 6.0.0 6.0.0 @@ -117,10 +119,12 @@ 6.0.0 6.0.0 6.0.0 + 6.0.0 6.0.0 6.0.0 6.0.0 6.0.0 + 6.0.0 6.0.0 diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj index e7868125ebf3..48791e68f596 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj @@ -68,6 +68,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" /> + + + + + + false diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 76362c47aad5..7db491507a73 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -120,6 +120,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant Runtime;Native + + + + + +