[automated] Merge branch 'release/3.0-preview3' => 'master'

.azure/pipelines/ci.yml

@@ -79,10 +79,6 @@ jobs:
       displayName: Run sign check
       condition: eq(variables['_SignType'], 'real')
 
-    # Detect OSS Components in use in the product. Only needs to run on one OS in the matrix.
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      displayName: Detect components
-      condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
     artifacts:
     - name: Windows_Packages
       path: artifacts/packages/

.azure/pipelines/jobs/default-build.yml

@@ -140,21 +140,26 @@ jobs:
       - ${{ if eq(parameters.agentOs, 'Windows') }}:
         - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.cmd
-        - powershell: eng\scripts\KillProcesses.ps1
-          displayName: Kill processes
-          condition: always()
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
         - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.sh
-        - script: eng/scripts/KillProcesses.sh
-          displayName: Kill processes
-          condition: always()
     - ${{ if ne(parameters.buildScript, '') }}:
       - script: $(BuildScript) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
         displayName: run $(BuildScript)
 
   - ${{ parameters.afterBuild }}
 
+  - ${{ if eq(parameters.agentOs, 'Windows') }}:
+    - powershell: eng\scripts\KillProcesses.ps1
+      displayName: Kill processes
+      continueOnError: true
+      condition: always()
+  - ${{ if ne(parameters.agentOs, 'Windows') }}:
+    - script: eng/scripts/KillProcesses.sh
+      displayName: Kill processes
+      continueOnError: true
+      condition: always()
+
   - task: PublishTestResults@2
     displayName: Publish test results
     condition: always()

eng/scripts/KillProcesses.ps1

@@ -1,16 +1,26 @@
 $ErrorActionPreference = 'Continue'
 
-taskkill /T /F /IM dotnet.exe
-taskkill /T /F /IM testhost.exe
-taskkill /T /F /IM iisexpress.exe
-taskkill /T /F /IM iisexpresstray.exe
-taskkill /T /F /IM w3wp.exe
-taskkill /T /F /IM msbuild.exe
-taskkill /T /F /IM vbcscompiler.exe
-taskkill /T /F /IM git.exe
-taskkill /T /F /IM vctip.exe
-taskkill /T /F /IM chrome.exe
-taskkill /T /F /IM h2spec.exe
+function _kill($processName) {
+    try {
+        # Redirect stderr to stdout to avoid big red blocks of output in Azure Pipeline logging
+        # when there are no instances of the process
+        & cmd /c "taskkill /T /F /IM ${processName} 2>&1"
+    } catch {
+        Write-Host "Failed to kill ${processName}: $_"
+    }
+}
+
+_kill dotnet.exe
+_kill testhost.exe
+_kill iisexpress.exe
+_kill iisexpresstray.exe
+_kill w3wp.exe
+_kill msbuild.exe
+_kill vbcscompiler.exe
+_kill git.exe
+_kill vctip.exe
+_kill chrome.exe
+_kill h2spec.exe
 iisreset /restart
 
 exit 0

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -18,11 +18,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <PackageTags>aspnetcore;targeting-pack</PackageTags>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
 
-    <!-- Subject to change: see https://github.com/dotnet/designs/pull/50 -->
-    <PackageType>TargetingPack</PackageType>
+    <PackageType>DotnetPlatform</PackageType>
     <RefAssemblyPackagePath>ref/$(TargetFramework)/</RefAssemblyPackagePath>
 
-    <LayoutTargetDir>$(TargetingPackLayoutRoot)packs/Microsoft.AspNetCore.App.Ref/$(PackageVersion)/$(RefAssemblyPackagePath)</LayoutTargetDir>
+    <LayoutTargetDir>$(TargetingPackLayoutRoot)packs/Microsoft.AspNetCore.App.Ref/$(PackageVersion)/</LayoutTargetDir>
     <ArchiveOutputFileName>aspnetcore-targeting-pack-$(PackageVersion).zip</ArchiveOutputFileName>
     <ArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName)</ArchiveOutputPath>
 
@@ -56,7 +55,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
       $(BuildDependsOn);
       GeneratePackageConflictManifest;
       _ResolveTargetingPackContent;
-      _BatchCopyToOutputDirectory;
       _BatchCopyToLayoutTargetDir;
       _CreateTargetingPackArchive;
     </BuildDependsOn>
@@ -87,15 +85,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
       <AspNetCoreReferenceDocXml Include="@(AspNetCoreReferenceAssemblyPath->'%(RootDir)%(Directory)%(FileName).xml')" />
 
-      <!-- Exclude known missing XML docs files. Time-boxing this workaround because we want XML docs for everything. This can be removed when we get a new build with https://github.com/dotnet/core-setup/pull/5109. -->
-      <AspNetCoreReferenceDocXml Remove="@(AspNetCoreReferenceDocXml)"
-        Condition="'$(MicrosoftNETCoreAppPackageVersion)' == '3.0.0-preview-27405-2' AND ('%(FileName)' == 'Microsoft.Extensions.DependencyModel' OR '%(FileName)' == 'Microsoft.DotNet.PlatformAbstractions' )" />
+      <RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
+      <RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
+      <RefPackContent Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(PackageConflictManifestPackagePath)" />
 
-      <RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" />
-      <RefPackContent Include="@(AspNetCoreReferenceDocXml)" />
-
-      <_PackageFiles Include="@(RefPackContent)" PackagePath="$(RefAssemblyPackagePath)" />
-      <_PackageFiles Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(PackageConflictManifestPackagePath)" />
+      <_PackageFiles Include="@(RefPackContent)" />
     </ItemGroup>
   </Target>
 
@@ -114,25 +108,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant
         Overwrite="true" />
   </Target>
 
-  <!-- Written to take advantage of target batching in MSBuild. -->
-  <Target Name="_BatchCopyToOutputDirectory"
-          DependsOnTargets="_ResolveTargetingPackContent"
-          Inputs="@(RefPackContent)"
-          Outputs="@(RefPackContent->'$(TargetDir)%(FileName)%(Extension)')">
-
-    <Copy SourceFiles="@(RefPackContent)"
-          DestinationFiles="@(RefPackContent->'$(TargetDir)%(FileName)%(Extension)')"
-          UseHardlinksIfPossible="true" />
-  </Target>
-
   <!-- Written to take advantage of target batching in MSBuild. -->
   <Target Name="_BatchCopyToLayoutTargetDir"
           DependsOnTargets="_ResolveTargetingPackContent"
           Inputs="@(RefPackContent)"
-          Outputs="@(RefPackContent->'$(LayoutTargetDir)%(FileName)%(Extension)')">
+          Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(FileName)%(Extension)')">
 
     <Copy SourceFiles="@(RefPackContent)"
-          DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(FileName)%(Extension)')"
+          DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(FileName)%(Extension)')"
           UseHardlinksIfPossible="true" />
   </Target>
 

src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -23,8 +23,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <PackageTags>aspnetcore;shared-framework</PackageTags>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
 
-    <!-- Subject to change: see https://github.com/dotnet/designs/pull/50 -->
-    <PackageType>RuntimePack</PackageType>
+    <PackageType>DotnetPlatform</PackageType>
     <!-- NuGet appends target framework to this value. Example: runtimes/win-x64/lib/netcoreapp3.0/ -->
     <BuildOutputTargetFolder>runtimes/$(RuntimeIdentifier)/lib/</BuildOutputTargetFolder>
     <!-- Target framework is not append to this because native assets to not have a target framework. -->

src/Framework/src/SharedFx.targets

@@ -15,10 +15,10 @@ This targets file should only be imported by .shfxproj files.
       GenerateSharedFxVersionsFile;
       GenerateBuildDependencyFile;
       PrepareForPublish;
-      GeneratePublishDependencyFile;
-      GenerateSharedFxMetadataFiles;
       GenerateBuildRuntimeConfigurationFiles;
       ComputeAndCopyFilesToPublishDirectory;
+      GeneratePublishDependencyFile;
+      GenerateSharedFxMetadataFiles;
       CopySharedFxToOutput;
       CollectSharedFxOutput;
       PostBuildEvent;

src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

@@ -49,6 +49,10 @@
         <_Parameter1>ManifestOutputDir</_Parameter1>
         <_Parameter2>%(_ResolvedFrameworkReference.ManifestOutputDir)</_Parameter2>
       </AssemblyAttribute>
+      <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+        <_Parameter1>RuntimeAssetsOutputPath</_Parameter1>
+        <_Parameter2>%(_ResolvedFrameworkReference.RuntimeAssetsOutputPath)</_Parameter2>
+      </AssemblyAttribute>
     </ItemGroup>
   </Target>
 

src/Framework/test/SharedFxTests.cs

@@ -24,6 +24,33 @@ public SharedFxTests(ITestOutputHelper output)
             _expectedRid = TestData.GetSharedFxRuntimeIdentifier();
         }
 
+        [Fact]
+        public void SharedFrameworkContainsExpectedFiles()
+        {
+            var actualAssemblies = Directory.GetFiles(TestData.GetTestDataValue("RuntimeAssetsOutputPath"), "*.dll")
+                .Select(Path.GetFileNameWithoutExtension)
+                .ToHashSet();
+            var expectedAssemblies = TestData.GetSharedFxDependencies()
+                .Split(';', StringSplitOptions.RemoveEmptyEntries)
+                .ToHashSet();
+
+            _output.WriteLine("==== actual assemblies ====");
+            _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
+            _output.WriteLine("==== expected assemblies ====");
+            _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
+
+            var missing = expectedAssemblies.Except(actualAssemblies);
+            var unexpected = actualAssemblies.Except(expectedAssemblies);
+
+            _output.WriteLine("==== missing assemblies from the framework ====");
+            _output.WriteLine(string.Join('\n', missing));
+            _output.WriteLine("==== unexpected assemblies in the framework ====");
+            _output.WriteLine(string.Join('\n', unexpected));
+
+            Assert.Empty(missing);
+            Assert.Empty(unexpected);
+        }
+
         [Fact]
         public void PlatformManifestListsAllFiles()
         {
@@ -35,7 +62,7 @@ public void PlatformManifestListsAllFiles()
             _output.WriteLine("==== file contents ====");
             _output.WriteLine(File.ReadAllText(platformManifestPath));
             _output.WriteLine("==== expected assemblies ====");
-            _output.WriteLine(string.Join('\n', expectedAssemblies));
+            _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
 
             AssertEx.FileExists(platformManifestPath);
 

src/Middleware/CORS/samples/SampleDestination/Startup.cs

@@ -50,8 +50,7 @@ public void ConfigureServices(IServiceCollection services)
                 options.AddPolicy("AllowAll", policy => policy
                     .AllowAnyOrigin()
                     .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials());
+                    .AllowAnyHeader());
             });
             services.AddRouting();
         }

src/Middleware/CORS/samples/SampleDestination/StartupWithoutEndpointRouting.cs

@@ -73,8 +73,7 @@ public void Configure(IApplicationBuilder app)
                 innerBuilder.UseCors(policy => policy
                     .AllowAnyOrigin()
                     .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials());
+                    .AllowAnyHeader());
 
                 innerBuilder.UseMiddleware<SampleMiddleware>();
             });

src/Middleware/CORS/src/Infrastructure/CorsPolicyBuilder.cs

@@ -224,6 +224,11 @@ public CorsPolicyBuilder SetIsOriginAllowedToAllowWildcardSubdomains()
         /// <returns>The constructed <see cref="CorsPolicy"/>.</returns>
         public CorsPolicy Build()
         {
+            if (_policy.AllowAnyOrigin && _policy.SupportsCredentials)
+            {
+                throw new InvalidOperationException(Resources.InsecureConfiguration);
+            }
+
             return _policy;
         }
 

src/Middleware/CORS/src/Infrastructure/CorsService.cs

@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Cors.Internal;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
@@ -77,7 +76,7 @@ public CorsResult EvaluatePolicy(HttpContext context, CorsPolicy policy)
 
             if (policy.AllowAnyOrigin && policy.SupportsCredentials)
             {
-                _logger.InsecureConfiguration();
+                throw new ArgumentException(Resources.InsecureConfiguration, nameof(policy));
             }
 
             var origin = context.Request.Headers[CorsConstants.Origin];

src/Middleware/CORS/src/Internal/CORSLoggerExtensions.cs

@@ -18,7 +18,6 @@ internal static class CORSLoggerExtensions
         private static readonly Action<ILogger, string, Exception> _requestHeaderNotAllowed;
         private static readonly Action<ILogger, Exception> _failedToSetCorsHeaders;
         private static readonly Action<ILogger, Exception> _noCorsPolicyFound;
-        private static readonly Action<ILogger, Exception> _insecureConfiguration;
         private static readonly Action<ILogger, Exception> _isNotPreflightRequest;
 
         static CORSLoggerExtensions()
@@ -73,11 +72,6 @@ static CORSLoggerExtensions()
                 new EventId(10, "NoCorsPolicyFound"),
                 "No CORS policy found for the specified request.");
 
-            _insecureConfiguration = LoggerMessage.Define(
-                LogLevel.Warning,
-                new EventId(11, "InsecureConfiguration"),
-                "The CORS protocol does not allow specifying a wildcard (any) origin and credentials at the same time. Configure the policy by listing individual origins if credentials needs to be supported.");
-
             _isNotPreflightRequest = LoggerMessage.Define(
                 LogLevel.Debug,
                 new EventId(12, "IsNotPreflightRequest"),
@@ -134,11 +128,6 @@ public static void NoCorsPolicyFound(this ILogger logger)
             _noCorsPolicyFound(logger, null);
         }
 
-        public static void InsecureConfiguration(this ILogger logger)
-        {
-            _insecureConfiguration(logger, null);
-        }
-
         public static void IsNotPreflightRequest(this ILogger logger)
         {
             _isNotPreflightRequest(logger, null);