diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 9b6bb325f4..f3e41d5e0a 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -9,6 +9,7 @@ trigger:
include:
- master
- release/*
+ - internal/release/3.*
# Run PR validation on all branches
pr:
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index aeb0b64b50..b5c8196535 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 3.0.1
+ 3.1.0
@@ -16,132 +16,132 @@
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
-
+
- 3.0.1
+ 3.1.0
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
@@ -186,510 +186,510 @@
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
+
-
+
- 3.0.0
+ 3.1.0
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
-
-
+
+
- 3.0.1
+ 3.1.0
-
-
-
+
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
-
+
+
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
+
- 3.0.0
+ 3.1.0
-
-
-
-
-
+
+
+
+
+
- 3.0.0
+ 3.1.0
-
+
-
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
+
+
- 3.0.0
+ 3.1.0
- 3.0.1
+ 3.1.0
- 3.0.1
+ 3.1.0
-
-
- 3.0.1
+
+
+ 3.1.0
-
-
- 3.0.1
+
+
+ 3.1.0
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
-
+
+
+
+
-
-
-
+
+
+
- 3.0.0
+ 3.1.0
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 638d42dd71..bdcbf3e91d 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -1,90 +1,89 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 047f31a3e2..943d24efe0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,17 +8,17 @@
3
1
- 0
- 3
+ 1
+ 0
- true
+ false
release
true
false
- rtm
- RTM
+ servicing
+ Servicing
4
preview$(BlazorClientPreReleasePreviewNumber)
diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
index df9cc7220a..775e7523c8 100644
--- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj
+++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
@@ -3,7 +3,6 @@
Exe
$(DefaultNetCoreTargetFramework)
- -s https://api.nuget.org/v3/index.json
$(MSBuildThisFileDirectory)../../
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index 8a2625b99d..ec8a646f48 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
}
- [Fact]
+ [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
public void AssembliesAreReferenceAssemblies()
{
IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore
});
}
- [Fact]
+ [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
public void PlatformManifestListsAllFiles()
{
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");