From efa4421e317772e52ce717f47302c3f36aee68b1 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 29 May 2020 13:31:25 -0700 Subject: [PATCH 1/9] Produce non-stable version of targeting pack --- eng/Build.props | 1 + .../Microsoft.AspNetCore.App.Ref.Internal.csproj | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj diff --git a/eng/Build.props b/eng/Build.props index 42a4992e7de1..631d303b6851 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -127,6 +127,7 @@ --> + + + $(DefaultNetCoreTargetFramework) + false + true + false + $(TargetingPackName).Internal + $(TargetingPackVersionPrefix) + + + From 71e66e76cab881bfa53bd2b9844f44b71aa6cb17 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 29 May 2020 13:53:59 -0700 Subject: [PATCH 2/9] Fix tag --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj index f3df09efcd10..a213fcbe1810 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj @@ -8,6 +8,7 @@ false $(TargetingPackName).Internal $(TargetingPackVersionPrefix) + From 11cd4e64b50d82f6ed90f81a6c8f6602da2d7038 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 29 May 2020 13:56:49 -0700 Subject: [PATCH 3/9] Fix indentation --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj index a213fcbe1810..abdd7d9ff495 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj @@ -10,5 +10,5 @@ $(TargetingPackVersionPrefix) - + From 7661dcd08241addfee7f0ef780bbabbb4db9f845 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 1 Jun 2020 10:32:07 -0700 Subject: [PATCH 4/9] Fixup proj file --- .../ref/Microsoft.AspNetCore.App.Ref.Internal.csproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj index abdd7d9ff495..f22ed58d2927 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj @@ -1,5 +1,4 @@ - - + $(DefaultNetCoreTargetFramework) @@ -8,7 +7,11 @@ false $(TargetingPackName).Internal $(TargetingPackVersionPrefix) + false + false + false + false + true - From 55bc03d0cf21d55c5b9842af0b6c94fce948c59e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 1 Jun 2020 12:36:45 -0700 Subject: [PATCH 5/9] Move Internal proj to separate folder --- eng/Build.props | 8 ++++---- ...Microsoft.AspNetCore.App.Ref.Internal.csproj | 0 src/Framework/{ => Public}/build.cmd | 2 +- ...Microsoft.AspNetCore.App.Ref.Internal.csproj | 17 +++++++++++++++++ .../ref/Microsoft.AspNetCore.App.Ref.csproj | 0 .../src/Microsoft.AspNetCore.App.Runtime.csproj | 0 .../src/runtimeconfig.template.json | 0 src/Framework/{ => Public}/test/AssertEx.cs | 0 .../Microsoft.AspNetCore.App.UnitTests.csproj | 6 +++--- .../{ => Public}/test/SharedFxTests.cs | 0 .../{ => Public}/test/TargetingPackTests.cs | 0 src/Framework/{ => Public}/test/TestData.cs | 0 .../{ => Public}/test/TestDataAttribute.cs | 0 .../Debian/Runtime/Debian.Runtime.debproj | 2 +- .../TargetingPack/Debian.TargetingPack.debproj | 2 +- src/Installers/Rpm/Rpm.Runtime.Common.targets | 2 +- .../Rpm/TargetingPack/Rpm.TargetingPack.rpmproj | 2 +- .../Infrastructure/GenerateTestProps.targets | 4 ++-- .../test/ProjectTemplates.Tests.csproj | 2 +- src/SiteExtensions/LoggingBranch/LB.csproj | 4 ++-- ...oft.AspNetCore.Runtime.SiteExtension.pkgproj | 2 +- 21 files changed, 35 insertions(+), 18 deletions(-) rename src/Framework/{ => Internal}/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj (100%) rename src/Framework/{ => Public}/build.cmd (68%) create mode 100644 src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj rename src/Framework/{ => Public}/ref/Microsoft.AspNetCore.App.Ref.csproj (100%) rename src/Framework/{ => Public}/src/Microsoft.AspNetCore.App.Runtime.csproj (100%) rename src/Framework/{ => Public}/src/runtimeconfig.template.json (100%) rename src/Framework/{ => Public}/test/AssertEx.cs (100%) rename src/Framework/{ => Public}/test/Microsoft.AspNetCore.App.UnitTests.csproj (94%) rename src/Framework/{ => Public}/test/SharedFxTests.cs (100%) rename src/Framework/{ => Public}/test/TargetingPackTests.cs (100%) rename src/Framework/{ => Public}/test/TestData.cs (100%) rename src/Framework/{ => Public}/test/TestDataAttribute.cs (100%) diff --git a/eng/Build.props b/eng/Build.props index 631d303b6851..cb8c3f5a4bb8 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -126,10 +126,10 @@ the entire pattern will silently fail to evaluate correctly. --> + + + $(DefaultNetCoreTargetFramework) + false + true + false + $(TargetingPackName).Internal + $(TargetingPackVersionPrefix) + false + false + false + false + true + + + diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.csproj similarity index 100% rename from src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj rename to src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.csproj diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/Public/src/Microsoft.AspNetCore.App.Runtime.csproj similarity index 100% rename from src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj rename to src/Framework/Public/src/Microsoft.AspNetCore.App.Runtime.csproj diff --git a/src/Framework/src/runtimeconfig.template.json b/src/Framework/Public/src/runtimeconfig.template.json similarity index 100% rename from src/Framework/src/runtimeconfig.template.json rename to src/Framework/Public/src/runtimeconfig.template.json diff --git a/src/Framework/test/AssertEx.cs b/src/Framework/Public/test/AssertEx.cs similarity index 100% rename from src/Framework/test/AssertEx.cs rename to src/Framework/Public/test/AssertEx.cs diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/Public/test/Microsoft.AspNetCore.App.UnitTests.csproj similarity index 94% rename from src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj rename to src/Framework/Public/test/Microsoft.AspNetCore.App.UnitTests.csproj index e79fd0ca25be..5b2ee0eefbfc 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/Public/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -63,21 +63,21 @@ - - - diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/Public/test/SharedFxTests.cs similarity index 100% rename from src/Framework/test/SharedFxTests.cs rename to src/Framework/Public/test/SharedFxTests.cs diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/Public/test/TargetingPackTests.cs similarity index 100% rename from src/Framework/test/TargetingPackTests.cs rename to src/Framework/Public/test/TargetingPackTests.cs diff --git a/src/Framework/test/TestData.cs b/src/Framework/Public/test/TestData.cs similarity index 100% rename from src/Framework/test/TestData.cs rename to src/Framework/Public/test/TestData.cs diff --git a/src/Framework/test/TestDataAttribute.cs b/src/Framework/Public/test/TestDataAttribute.cs similarity index 100% rename from src/Framework/test/TestDataAttribute.cs rename to src/Framework/Public/test/TestDataAttribute.cs diff --git a/src/Installers/Debian/Runtime/Debian.Runtime.debproj b/src/Installers/Debian/Runtime/Debian.Runtime.debproj index 7f374e5288f8..95dccacb1e98 100644 --- a/src/Installers/Debian/Runtime/Debian.Runtime.debproj +++ b/src/Installers/Debian/Runtime/Debian.Runtime.debproj @@ -22,7 +22,7 @@ - + false true diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index 61e37f44ecb3..de17ac68fdf2 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -26,7 +26,7 @@ - + false true diff --git a/src/Installers/Rpm/Rpm.Runtime.Common.targets b/src/Installers/Rpm/Rpm.Runtime.Common.targets index 5cd0ee676fc3..37bb206829fc 100644 --- a/src/Installers/Rpm/Rpm.Runtime.Common.targets +++ b/src/Installers/Rpm/Rpm.Runtime.Common.targets @@ -18,7 +18,7 @@ - + false true diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index ee3b3f707f39..1dc9f57896d3 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -15,7 +15,7 @@ - + false true diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 948108395aaa..342a65015305 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -5,7 +5,7 @@ Condition="$(DesignTimeBuild) != true"> - @@ -19,7 +19,7 @@ - diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 5ed506cf28cf..d32cb16c8920 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -37,7 +37,7 @@ - + false true diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj index 1cf9f52287fc..8672a27cd2d4 100644 --- a/src/SiteExtensions/LoggingBranch/LB.csproj +++ b/src/SiteExtensions/LoggingBranch/LB.csproj @@ -21,11 +21,11 @@ - + false true - + false true diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 1e9d62825872..20dfe5d51588 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -26,7 +26,7 @@ - + false true From 812f39b0557640035e3cd21df9a35dd828063547 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 1 Jun 2020 12:40:13 -0700 Subject: [PATCH 6/9] Remove redundant proj --- ...Microsoft.AspNetCore.App.Ref.Internal.csproj | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj diff --git a/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj deleted file mode 100644 index f22ed58d2927..000000000000 --- a/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework) - false - true - false - $(TargetingPackName).Internal - $(TargetingPackVersionPrefix) - false - false - false - false - true - - - From 2306eaf5dff7d864117baad09cb612d5f9c2c7c2 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 1 Jun 2020 15:06:07 -0700 Subject: [PATCH 7/9] Start moving files --- .../src}/Microsoft.AspNetCore.App.Ref.Internal.csproj | 0 .../ref => App.Ref/src}/Microsoft.AspNetCore.App.Ref.csproj | 2 +- .../src/Microsoft.AspNetCore.App.Runtime.csproj | 0 .../{Public => App.Runtime}/src/runtimeconfig.template.json | 0 src/Framework/Public/build.cmd | 3 --- src/Framework/{Public => }/test/AssertEx.cs | 0 .../test/Microsoft.AspNetCore.App.UnitTests.csproj | 0 src/Framework/{Public => }/test/SharedFxTests.cs | 0 src/Framework/{Public => }/test/TargetingPackTests.cs | 0 src/Framework/{Public => }/test/TestData.cs | 0 src/Framework/{Public => }/test/TestDataAttribute.cs | 0 11 files changed, 1 insertion(+), 4 deletions(-) rename src/Framework/{Internal/ref => App.Ref.Internal/src}/Microsoft.AspNetCore.App.Ref.Internal.csproj (100%) rename src/Framework/{Public/ref => App.Ref/src}/Microsoft.AspNetCore.App.Ref.csproj (99%) rename src/Framework/{Public => App.Runtime}/src/Microsoft.AspNetCore.App.Runtime.csproj (100%) rename src/Framework/{Public => App.Runtime}/src/runtimeconfig.template.json (100%) delete mode 100644 src/Framework/Public/build.cmd rename src/Framework/{Public => }/test/AssertEx.cs (100%) rename src/Framework/{Public => }/test/Microsoft.AspNetCore.App.UnitTests.csproj (100%) rename src/Framework/{Public => }/test/SharedFxTests.cs (100%) rename src/Framework/{Public => }/test/TargetingPackTests.cs (100%) rename src/Framework/{Public => }/test/TestData.cs (100%) rename src/Framework/{Public => }/test/TestDataAttribute.cs (100%) diff --git a/src/Framework/Internal/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj similarity index 100% rename from src/Framework/Internal/ref/Microsoft.AspNetCore.App.Ref.Internal.csproj rename to src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj diff --git a/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj similarity index 99% rename from src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.csproj rename to src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj index 46e82aa3b55b..ca4fd5526f3a 100644 --- a/src/Framework/Public/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj @@ -62,7 +62,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + false true diff --git a/src/Framework/Public/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj similarity index 100% rename from src/Framework/Public/src/Microsoft.AspNetCore.App.Runtime.csproj rename to src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj diff --git a/src/Framework/Public/src/runtimeconfig.template.json b/src/Framework/App.Runtime/src/runtimeconfig.template.json similarity index 100% rename from src/Framework/Public/src/runtimeconfig.template.json rename to src/Framework/App.Runtime/src/runtimeconfig.template.json diff --git a/src/Framework/Public/build.cmd b/src/Framework/Public/build.cmd deleted file mode 100644 index 3d2fb28db5aa..000000000000 --- a/src/Framework/Public/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -SET RepoRoot=%~dp0..\..\.. -%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Framework/Public/test/AssertEx.cs b/src/Framework/test/AssertEx.cs similarity index 100% rename from src/Framework/Public/test/AssertEx.cs rename to src/Framework/test/AssertEx.cs diff --git a/src/Framework/Public/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj similarity index 100% rename from src/Framework/Public/test/Microsoft.AspNetCore.App.UnitTests.csproj rename to src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj diff --git a/src/Framework/Public/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs similarity index 100% rename from src/Framework/Public/test/SharedFxTests.cs rename to src/Framework/test/SharedFxTests.cs diff --git a/src/Framework/Public/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs similarity index 100% rename from src/Framework/Public/test/TargetingPackTests.cs rename to src/Framework/test/TargetingPackTests.cs diff --git a/src/Framework/Public/test/TestData.cs b/src/Framework/test/TestData.cs similarity index 100% rename from src/Framework/Public/test/TestData.cs rename to src/Framework/test/TestData.cs diff --git a/src/Framework/Public/test/TestDataAttribute.cs b/src/Framework/test/TestDataAttribute.cs similarity index 100% rename from src/Framework/Public/test/TestDataAttribute.cs rename to src/Framework/test/TestDataAttribute.cs From b5f4202e4ecdd7f78d2661060e1305394a97e7c5 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 1 Jun 2020 15:18:09 -0700 Subject: [PATCH 8/9] finish moving files --- eng/Build.props | 8 ++-- src/Framework/build.cmd | 3 ++ .../Microsoft.AspNetCore.App.UnitTests.csproj | 10 ++--- .../Debian/Runtime/Debian.Runtime.debproj | 2 +- .../Debian.TargetingPack.debproj | 2 +- src/Installers/Rpm/Rpm.Runtime.Common.targets | 2 +- .../TargetingPack/Rpm.TargetingPack.rpmproj | 2 +- src/ProjectTemplates/ProjectTemplates.sln | 43 +++++++------------ .../Infrastructure/GenerateTestProps.targets | 4 +- .../test/ProjectTemplates.Tests.csproj | 2 +- src/SiteExtensions/LoggingBranch/LB.csproj | 4 +- ...t.AspNetCore.Runtime.SiteExtension.pkgproj | 2 +- 12 files changed, 37 insertions(+), 47 deletions(-) create mode 100644 src/Framework/build.cmd diff --git a/eng/Build.props b/eng/Build.props index cb8c3f5a4bb8..961e652ee938 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -126,10 +126,10 @@ the entire pattern will silently fail to evaluate correctly. --> + false true - + false true @@ -63,21 +63,21 @@ - - - diff --git a/src/Installers/Debian/Runtime/Debian.Runtime.debproj b/src/Installers/Debian/Runtime/Debian.Runtime.debproj index 95dccacb1e98..70931ff3a4ed 100644 --- a/src/Installers/Debian/Runtime/Debian.Runtime.debproj +++ b/src/Installers/Debian/Runtime/Debian.Runtime.debproj @@ -22,7 +22,7 @@ - + false true diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index de17ac68fdf2..43eba9135887 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -26,7 +26,7 @@ - + false true diff --git a/src/Installers/Rpm/Rpm.Runtime.Common.targets b/src/Installers/Rpm/Rpm.Runtime.Common.targets index 37bb206829fc..dea8c0148d67 100644 --- a/src/Installers/Rpm/Rpm.Runtime.Common.targets +++ b/src/Installers/Rpm/Rpm.Runtime.Common.targets @@ -18,7 +18,7 @@ - + false true diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index 1dc9f57896d3..38f5fbf78bb6 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -15,7 +15,7 @@ - + false true diff --git a/src/ProjectTemplates/ProjectTemplates.sln b/src/ProjectTemplates/ProjectTemplates.sln index da18f3a2e57d..236b9ecb0322 100644 --- a/src/ProjectTemplates/ProjectTemplates.sln +++ b/src/ProjectTemplates/ProjectTemplates.sln @@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTemplates.Tests", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{4B971DBF-6B07-4DC5-914D-4D5681F220CC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj", "{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{E6B319D0-6A92-47D8-BC46-904DA44664A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{05291368-373F-48AA-84FC-5B1E4606641A}" @@ -177,6 +175,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAut EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "..\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -259,18 +259,6 @@ Global {4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x64.Build.0 = Release|Any CPU {4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.ActiveCfg = Release|Any CPU {4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.Build.0 = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.ActiveCfg = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.Build.0 = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.Build.0 = Debug|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.Build.0 = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.ActiveCfg = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.Build.0 = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.ActiveCfg = Release|Any CPU - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.Build.0 = Release|Any CPU {E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1207,18 +1195,6 @@ Global {6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x64.Build.0 = Release|Any CPU {6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.ActiveCfg = Release|Any CPU {6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.Build.0 = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.ActiveCfg = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.Build.0 = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.ActiveCfg = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.Build.0 = Debug|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.Build.0 = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.ActiveCfg = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.Build.0 = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.ActiveCfg = Release|Any CPU - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.Build.0 = Release|Any CPU {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.Build.0 = Debug|Any CPU {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1231,13 +1207,24 @@ Global {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x64.Build.0 = Release|Any CPU {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.ActiveCfg = Release|Any CPU {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.Build.0 = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.ActiveCfg = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.Build.0 = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.ActiveCfg = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.Build.0 = Debug|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.Build.0 = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.ActiveCfg = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.Build.0 = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.ActiveCfg = Release|Any CPU + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {4B971DBF-6B07-4DC5-914D-4D5681F220CC} = {D64F966A-B33B-4554-BA8C-A1AF91265996} - {4D91ADAC-7CE2-4738-B6C5-986626F14EB5} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {E6B319D0-6A92-47D8-BC46-904DA44664A5} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {05291368-373F-48AA-84FC-5B1E4606641A} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {4BA90E96-EFFC-40CD-B101-054F492F77BE} = {D64F966A-B33B-4554-BA8C-A1AF91265996} @@ -1316,8 +1303,8 @@ Global {EEB670DC-9FE2-45A2-B7E9-9BCF7D1056E4} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {81B96508-D920-45F6-9534-0D348B11DFAB} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {6012D544-32B4-4F5C-B335-A224AA4F661D} = {D64F966A-B33B-4554-BA8C-A1AF91265996} - {706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {06D0D7B2-EDA3-45A2-A060-AB791ED1DB80} = {D64F966A-B33B-4554-BA8C-A1AF91265996} + {E4AF72F9-9F63-4965-ADEE-A67147E5FC31} = {D64F966A-B33B-4554-BA8C-A1AF91265996} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D2F122BA-928C-4179-B503-6744DB64BA13} diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 342a65015305..fab12730856c 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -5,7 +5,7 @@ Condition="$(DesignTimeBuild) != true"> - @@ -19,7 +19,7 @@ - diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d32cb16c8920..8b5ea9d8d5b6 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -37,7 +37,7 @@ - + false true diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj index 8672a27cd2d4..8de0fa6b2e3a 100644 --- a/src/SiteExtensions/LoggingBranch/LB.csproj +++ b/src/SiteExtensions/LoggingBranch/LB.csproj @@ -21,11 +21,11 @@ - + false true - + false true diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 20dfe5d51588..4ed4073487e3 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -26,7 +26,7 @@ - + false true From cc0813227cb5ccff0ec70bd18872d7baf759294b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 2 Jun 2020 10:51:04 -0700 Subject: [PATCH 9/9] Set IsReferenceAssemblyProject=true in targeting pack proj --- src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj | 2 ++ 1 file changed, 2 insertions(+) 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 ca4fd5526f3a..f0f8bc3caba2 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj @@ -6,6 +6,8 @@ true true false + + true $(TargetingPackName) $(TargetingPackVersionPrefix)