diff --git a/build/SharedFx.props b/build/SharedFx.props
index bc05e05024..cca84a1ef7 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -26,7 +26,7 @@
aspnetcore-runtime
$(SharedFxInstallerName)-internal
diff --git a/build/artifacts.props b/build/artifacts.props
index 2ebd420159..571d19c37b 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -21,9 +21,7 @@
-
-
diff --git a/build/repo.props b/build/repo.props
index 3d9c7d647b..0e6bae96c6 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -39,7 +39,6 @@
-
diff --git a/docs/PackageArchives.md b/docs/PackageArchives.md
index 04890a3aaf..420e0906df 100644
--- a/docs/PackageArchives.md
+++ b/docs/PackageArchives.md
@@ -42,7 +42,6 @@ The result of this typically means including the transitive graph of the followi
- Packages that match bundled runtimes
- Microsoft.NETCore.App
- Microsoft.AspNetCore.App
- - Microsoft.AspNetCore.All
- Packages that Microsoft.NET.Sdk adds implicitly
- Microsoft.NETCore.App
- NETStandard.Library
@@ -60,5 +59,4 @@ Given the following parameters:
The LZMA should contain
- Microsoft.NETCore.App/2.1.0 + netcoreapp2.1 dependencies (Microsoft.NET.Sdk will implicitly reference "2.1", which NuGet to 2.1.0)
- Microsoft.NETCore.App/2.1.8 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.NETCore.App/2.1.8/)
- - Microsoft.AspNetCore.All/2.1.7 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.AspNetCore.All/2.1.7/)
- NETStandard.Library/2.0.1 + netstandard2.0 dependencies (Microsoft.NET.Sdk will implicitly reference "2.0.1")
diff --git a/src/Framework/Framework.UnitTests/SharedFxTests.cs b/src/Framework/Framework.UnitTests/SharedFxTests.cs
index 2d255fe35e..e5376a5a94 100644
--- a/src/Framework/Framework.UnitTests/SharedFxTests.cs
+++ b/src/Framework/Framework.UnitTests/SharedFxTests.cs
@@ -9,30 +9,29 @@ namespace Microsoft.AspNetCore
{
public class SharedFxTests
{
- [Theory]
- [MemberData(nameof(GetSharedFxConfig))]
- public void ItContainsValidRuntimeConfigFile(SharedFxConfig config)
+ [Fact]
+ public void ItContainsValidRuntimeConfigFile()
{
- var runtimeConfigFilePath = Path.Combine(config.MetadataOutput, config.Name + ".runtimeconfig.json");
+ var runtimeConfigFilePath = Path.Combine(GetMetadataOutput(), "Microsoft.AspNetCore.App.runtimeconfig.json");
AssertEx.FileExists(runtimeConfigFilePath);
- AssertEx.FileDoesNotExists(Path.Combine(config.MetadataOutput, config.Name + ".runtimeconfig.dev.json"));
+ AssertEx.FileDoesNotExists(Path.Combine(GetMetadataOutput(), "Microsoft.AspNetCore.App.runtimeconfig.dev.json"));
var runtimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigFilePath));
- Assert.Equal(config.BaseSharedFxName, (string)runtimeConfig["runtimeOptions"]["framework"]["name"]);
- Assert.Equal("netcoreapp" + config.Version.Substring(0, 3), (string)runtimeConfig["runtimeOptions"]["tfm"]);
+ Assert.Equal("Microsoft.NETCore.App", (string)runtimeConfig["runtimeOptions"]["framework"]["name"]);
+ Assert.Equal("netcoreapp" + TestData.GetPackageVersion().Substring(0, 3), (string)runtimeConfig["runtimeOptions"]["tfm"]);
- Assert.Equal(config.BaseSharedFxVersion, (string)runtimeConfig["runtimeOptions"]["framework"]["version"]);
+ Assert.Equal(TestData.GetMicrosoftNETCoreAppPackageVersion(), (string)runtimeConfig["runtimeOptions"]["framework"]["version"]);
}
- [Theory]
- [MemberData(nameof(GetSharedFxConfig))]
- public void ItContainsValidDepsJson(SharedFxConfig config)
+ [Fact]
+ public void ItContainsValidDepsJson()
{
- var depsFilePath = Path.Combine(config.MetadataOutput, config.Name + ".deps.json");
+ var depsFilePath = Path.Combine(GetMetadataOutput(), "Microsoft.AspNetCore.App.deps.json");
+ var rid = TestData.GetSharedFxRuntimeIdentifier();
- var target = $".NETCoreApp,Version=v{config.Version.Substring(0, 3)}/{config.RuntimeIdentifier}";
+ var target = $".NETCoreApp,Version=v{TestData.GetPackageVersion().Substring(0, 3)}/{rid}";
AssertEx.FileExists(depsFilePath);
@@ -42,7 +41,7 @@ namespace Microsoft.AspNetCore
Assert.NotNull(depsFile["targets"][target]);
Assert.NotNull(depsFile["compilationOptions"]);
Assert.Empty(depsFile["compilationOptions"]);
- Assert.NotEmpty(depsFile["runtimes"][config.RuntimeIdentifier]);
+ Assert.NotEmpty(depsFile["runtimes"][rid]);
Assert.All(depsFile["libraries"], item =>
{
var prop = Assert.IsType(item);
@@ -52,50 +51,17 @@ namespace Microsoft.AspNetCore
});
}
- [Theory]
- [MemberData(nameof(GetSharedFxConfig))]
- public void ItContainsVersionFile(SharedFxConfig config)
+ [Fact]
+ public void ItContainsVersionFile()
{
- var versionFile = Path.Combine(config.MetadataOutput, ".version");
+ var versionFile = Path.Combine(GetMetadataOutput(), ".version");
AssertEx.FileExists(versionFile);
var lines = File.ReadAllLines(versionFile);
Assert.Equal(2, lines.Length);
Assert.Equal(TestData.GetRepositoryCommit(), lines[0]);
- Assert.Equal(config.Version, lines[1]);
+ Assert.Equal(TestData.GetPackageVersion(), lines[1]);
}
- public static TheoryData GetSharedFxConfig()
- => new TheoryData
- {
- new SharedFxConfig
- {
- Name = "Microsoft.AspNetCore.All",
- Version = TestData.GetPackageVersion(),
- // Intentionally assert aspnetcore frameworks align versions with each other and netcore
- BaseSharedFxVersion = TestData.GetPackageVersion(),
- BaseSharedFxName = "Microsoft.AspNetCore.App",
- RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(),
- MetadataOutput = TestData.GetTestDataValue("SharedFxMetadataOutput:Microsoft.AspNetCore.All")
- },
- new SharedFxConfig
- {
- Name = "Microsoft.AspNetCore.App",
- Version = TestData.GetPackageVersion(),
- BaseSharedFxName = "Microsoft.NETCore.App",
- BaseSharedFxVersion = TestData.GetMicrosoftNETCoreAppPackageVersion(),
- RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(),
- MetadataOutput = TestData.GetTestDataValue("SharedFxMetadataOutput:Microsoft.AspNetCore.App")
- },
- };
-
- public class SharedFxConfig
- {
- public string Name { get; set; }
- public string Version { get; set; }
- public string BaseSharedFxName { get; set; }
- public string BaseSharedFxVersion { get; set; }
- public string RuntimeIdentifier { get; set; }
- public string MetadataOutput { get; set; }
- }
+ private string GetMetadataOutput() => TestData.GetTestDataValue("SharedFxMetadataOutput:Microsoft.AspNetCore.App");
}
}
diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj b/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj
deleted file mode 100644
index fbf68c27fa..0000000000
--- a/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- netcoreapp3.0
- aspnetcore
- Provides a default set of APIs for building an ASP.NET Core application, and also includes API for third-party integrations with ASP.NET Core.
-
-This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, or can be acquired separately using installers available at https://aka.ms/dotnet-download.
-
-
-
-
-
-
-
-
-
-
-
- Minimum
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.props b/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.props
deleted file mode 100644
index 0295c8a39f..0000000000
--- a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.props
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- <_AspNetCoreAppSharedFxIsEnabled>false
-
-
- <_AspNetCoreAllSharedFxIsEnabled>true
-
-
diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets b/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
deleted file mode 100644
index c4f1f46390..0000000000
--- a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Microsoft.AspNetCore.All
-
-
-
-
-
-
diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp3.0/_._ b/src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp3.0/_._
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj b/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj
deleted file mode 100644
index 1912b3f498..0000000000
--- a/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- netcoreapp3.0
- Microsoft.AspNetCore.App
- $(MicrosoftNETCoreAppPackageVersion)
-
-
- runtime.$(SharedFxRid).$(MSBuildProjectName)
- This package provides assets used for self-contained deployments of an ASP.NET Core application. It is an internal implementation package not meant for direct consumption. Please do not reference directly.
-
-$(MSBuildProjectName) provides a default set of APIs for building an ASP.NET Core application, and also includes API for third-party integrations with ASP.NET Core.
-
-
-
-
-
-
-
-
-
diff --git a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
index 6dc23a24ca..84aa2736a7 100644
--- a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
+++ b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
@@ -12,7 +12,6 @@
-