From 57869f6493a327e3852a02b0b856a1827c7a3b6d Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 6 Jan 2021 15:08:47 -0800 Subject: [PATCH 1/3] Don't include RuntimeList.xml in sharedFx archive --- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dd7368806f96..f408d8255966 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -545,7 +545,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant RootAttributes="@(FrameworkListRootAttributes)" /> - + <_PackageFiles Include="$(FrameworkListOutputPath)" PackagePath="$(ManifestsPackagePath)" /> <_PackageFiles Include="@(RuntimePackContent)" /> From 9c20d21652b907506e6b3b6103fac10d5f0e25d5 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 6 Jan 2021 15:51:25 -0800 Subject: [PATCH 2/3] Don't output RuntimeList.xml to SharedFx dir --- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f408d8255966..1e524b8401be 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -154,7 +154,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(LocalDotNetRoot)$(SharedRuntimeSubPath) RuntimeList.xml - $(SharedFxLayoutTargetDir)$(FrameworkListFileName) + $(ArtifactsObjDir)$(FrameworkListFileName) $(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) $(InstallersOutputPath)$(InternalArchiveOutputFileName) From ba767fd3d5775c9c53853d3cee96d3a707184f83 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 7 Jan 2021 09:52:55 -0800 Subject: [PATCH 3/3] Add comment --- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 1 + 1 file changed, 1 insertion(+) 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 1e524b8401be..cfbe759aff09 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -545,6 +545,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant RootAttributes="@(FrameworkListRootAttributes)" /> + <_PackageFiles Include="$(FrameworkListOutputPath)" PackagePath="$(ManifestsPackagePath)" /> <_PackageFiles Include="@(RuntimePackContent)" />