Merge branch 'release/7.0' into merge/release/7.0-rc1-to-release/7.0

Author: dougbu

.azure/pipelines/components-e2e-tests.yml

@@ -40,7 +40,7 @@ jobs:
       displayName: Update submodules
     - script: ./restore.sh
       displayName: Run restore.sh
-    - script: npm install --prefix ./src/Components/test/E2ETest
+    - script: yarn install --frozen-lockfile --cwd ./src/Components/test/E2ETest
       displayName: NPM install
     - script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
       displayName: Build

.github/fabricbot.json

@@ -2562,7 +2562,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "7.0-rc1"
+              "milestoneName": "7.0-rc2"
             }
           }
         ],

eng/Version.Details.xml

@@ -42,7 +42,10 @@
   <Target Name="Restore">
     <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Restore" />
     <Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" />
-    <Yarn Command="install --mutex network $(InstallArgs)" StandardOutputImportance="High" StandardErrorImportance="High" IgnoreStandardErrorWarningFormat="$(IgnoreYarnWarnings)" />
+    <Yarn Command="install --mutex network $(InstallArgs) --frozen-lockfile"
+        StandardOutputImportance="High"
+        StandardErrorImportance="High"
+        IgnoreStandardErrorWarningFormat="$(IgnoreYarnWarnings)" />
   </Target>
 
   <Target Name="PrepareForBuild">

eng/Versions.props

@@ -159,32 +159,38 @@ public void SharedFrameworkContainsValidDepsJson()
     [Fact]
     public void SharedFrameworkAssembliesHaveExpectedAssemblyVersions()
     {
-        // Only test managed assemblies from dotnet/aspnetcore.
+        // Assemblies from this repo and dotnet/runtime don't always have identical assembly versions.
         var repoAssemblies = TestData.GetSharedFrameworkBinariesFromRepo()
             .Split(';', StringSplitOptions.RemoveEmptyEntries)
             .ToHashSet();
 
         var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppPackageVersion().Split('-', 2)[0];
         var version = Version.Parse(versionStringWithoutPrereleaseTag);
+        var aspnetcoreVersionString = TestData.GetSharedFxVersion().Split('-', 2)[0];
+        var aspnetcoreVersion = Version.Parse(aspnetcoreVersionString);
+
         var dlls = Directory.GetFiles(_sharedFxRoot, "*.dll", SearchOption.AllDirectories);
         Assert.NotEmpty(dlls);
 
         Assert.All(dlls, path =>
         {
-            // Unlike dotnet/aspnetcore, dotnet/runtime varies the assembly version while in servicing.
-            if (!repoAssemblies.Contains(Path.GetFileNameWithoutExtension(path)))
+            var name = Path.GetFileNameWithoutExtension(path);
+            if (string.Equals(name, "aspnetcorev2_inprocess", StringComparison.Ordinal))
             {
+                // Skip our native assembly.
                 return;
             }
 
+            var expectedVersion = repoAssemblies.Contains(name) ? aspnetcoreVersion : version;
+
             using var fileStream = File.OpenRead(path);
             using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
             var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
             var assemblyDefinition = reader.GetAssemblyDefinition();
 
             // Assembly versions should all match Major.Minor.0.0
-            Assert.Equal(version.Major, assemblyDefinition.Version.Major);
-            Assert.Equal(version.Minor, assemblyDefinition.Version.Minor);
+            Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major);
+            Assert.Equal(expectedVersion.Minor, assemblyDefinition.Version.Minor);
             Assert.Equal(0, assemblyDefinition.Version.Build);
             Assert.Equal(0, assemblyDefinition.Version.Revision);
         });

eng/targets/Npm.Common.targets

@@ -38,7 +38,7 @@ public void TargetingPackContainsListedAssemblies()
         var actualAssemblies = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll")
             .Select(Path.GetFileNameWithoutExtension)
             .ToHashSet();
-        var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.Keys.ToHashSet();
+        var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.ToHashSet();
 
         _output.WriteLine("==== actual assemblies ====");
         _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
@@ -60,20 +60,37 @@ public void TargetingPackContainsListedAssemblies()
     [Fact]
     public void RefAssembliesHaveExpectedAssemblyVersions()
     {
+        // Assemblies from this repo and dotnet/runtime don't always have identical assembly versions.
+        var repoAssemblies = TestData.GetAspNetCoreTargetingPackDependencies()
+            .Split(';', StringSplitOptions.RemoveEmptyEntries)
+            .ToHashSet();
+
+        var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppPackageVersion().Split('-', 2)[0];
+        var version = Version.Parse(versionStringWithoutPrereleaseTag);
+        var aspnetcoreVersionString = TestData.GetSharedFxVersion().Split('-', 2)[0];
+        var aspnetcoreVersion = Version.Parse(aspnetcoreVersionString);
+
         IEnumerable<string> dlls = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll", SearchOption.AllDirectories);
         Assert.NotEmpty(dlls);
 
         Assert.All(dlls, path =>
         {
+            var expectedVersion = repoAssemblies.Contains(Path.GetFileNameWithoutExtension(path)) ?
+                aspnetcoreVersion :
+                version;
+
             var fileName = Path.GetFileNameWithoutExtension(path);
             var assemblyName = AssemblyName.GetAssemblyName(path);
             using var fileStream = File.OpenRead(path);
             using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
             var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
             var assemblyDefinition = reader.GetAssemblyDefinition();
 
-            TestData.ListedTargetingPackAssemblies.TryGetValue(fileName, out var expectedVersion);
-            Assert.Equal(expectedVersion, assemblyDefinition.Version.ToString());
+            // Assembly versions should all match Major.Minor.0.0
+            Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major);
+            Assert.Equal(expectedVersion.Minor, assemblyDefinition.Version.Minor);
+            Assert.Equal(0, assemblyDefinition.Version.Build);
+            Assert.Equal(0, assemblyDefinition.Version.Revision);
         });
     }