Move all of DataProtection and Extensions.Identity to netstandard2.0

.azure/pipelines/ci.yml

@@ -431,6 +431,10 @@ jobs:
     - bash: "./eng/scripts/install-nginx-mac.sh"
       displayName: Installing Nginx
     afterBuild:
+    - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      displayName: Pack Packages (for Template tests)
+    - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      displayName: Pack Templates (for Template tests)
     - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
       displayName: Run Flaky Tests
       continueOnError: true
@@ -456,6 +460,10 @@ jobs:
     - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
       displayName: Increase inotify limit
     afterBuild:
+    - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      displayName: Pack Packages (for Template tests)
+    - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      displayName: Pack Templates (for Template tests)
     - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
       displayName: Run Flaky Tests
       continueOnError: true

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

@@ -104,12 +104,8 @@ jobs:
           queue: BuildPool.Windows.10.Amd64.VS2019.Open
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         name: NetCoreInternal-Pool
-        ${{ if ne(parameters.isTestingJob, true) }}:
-          # Visual Studio Build Tools
-          queue: BuildPool.Windows.10.Amd64.VS2019.BT
-        ${{ if eq(parameters.isTestingJob, true) }}:
-          # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
-          queue: BuildPool.Windows.10.Amd64.VS2019
+        # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
+        queue: BuildPool.Windows.10.Amd64.VS2019
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping

Directory.Build.props

@@ -70,6 +70,10 @@
     <SharedFxName>Microsoft.AspNetCore.App</SharedFxName>
     <SharedFxDescription>Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub ($(RepositoryUrl)). We happily accept issues and PRs.</SharedFxDescription>
 
+    <NETCoreAppFrameworkIdentifier>.NETCoreApp</NETCoreAppFrameworkIdentifier>
+    <NETCoreAppFramework>netcoreapp$(AspNetCoreMajorMinorVersion)</NETCoreAppFramework>
+    <AspNetCoreAppFrameworkBrandName>ASP.NET Core $(AspNetCoreMajorMinorVersion)</AspNetCoreAppFrameworkBrandName>
+
     <TargetingPackName>Microsoft.AspNetCore.App.Ref</TargetingPackName>
     <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
     <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>

build.ps1

@@ -324,6 +324,7 @@ if ($tmpBinaryLog) {
 # Capture MSBuild crash logs
 $env:MSBUILDDEBUGPATH = $LogDir
 
+$local:exit_code = $null
 try {
     # Import custom tools configuration, if present in the repo.
     # Note: Import in global scope so that the script set top-level variables without qualification.
@@ -342,6 +343,10 @@ try {
 
     $restore = $tmpRestore
 
+    if ($ci) {
+        $global:VerbosePreference = 'Continue'
+    }
+
     if (-not $NoBuildRepoTasks) {
         MSBuild $toolsetBuildProj `
             /p:RepoRoot=$RepoRoot `
@@ -359,9 +364,13 @@ try {
 catch {
     Write-Host $_.ScriptStackTrace
     Write-PipelineTaskError -Message $_
-    ExitWithExitCode 1
+    $exit_code = 1
 }
 finally {
+    if (! $exit_code) {
+        $exit_code = $LASTEXITCODE
+    }
+
     # tools.ps1 corrupts global state, so reset these values so they don't carry between invocations of build.ps1
     rm variable:global:_BuildTool -ea Ignore
     rm variable:global:_DotNetInstallDir -ea Ignore
@@ -378,4 +387,4 @@ finally {
     }
 }
 
-ExitWithExitCode 0
+ExitWithExitCode $exit_code

eng/SharedFramework.External.props

@@ -91,6 +91,9 @@
     This references are part of Microsoft.NETCore.App, so are listed here as references to be used during compilation only.
   -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+    <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
+    <_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
+    <_CompilationOnlyReference Include="System.Security.Principal.Windows" />
     <_CompilationOnlyReference Include="System.Buffers" />
     <_CompilationOnlyReference Include="System.ComponentModel.Annotations" />
     <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />

eng/SharedFramework.Local.props

@@ -8,8 +8,15 @@
 <Project>
   <ItemGroup>
     <!-- These assemblies are available as both a NuGet package and in the shared framework -->
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.DataProtection.Abstractions" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Cryptography.Internal" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.DataProtection" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.DataProtection.Extensions" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Features" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Metadata" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Identity.Core" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Identity.Stores" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Connections.Abstractions" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Authorization" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" />
@@ -20,11 +27,6 @@
 
     <!-- These assemblies are only in the shared framework -->
     <AspNetCoreAppReference Include="Microsoft.AspNetCore" />
-    <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" />
-    <AspNetCoreAppReference Include="Microsoft.AspNetCore.Cryptography.Internal" />
-    <AspNetCoreAppReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
-    <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection" />
-    <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Antiforgery" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Hosting" />
@@ -40,8 +42,6 @@
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.WebUtilities" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Html.Abstractions" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Identity" />
-    <AspNetCoreAppReference Include="Microsoft.Extensions.Identity.Core" />
-    <AspNetCoreAppReference Include="Microsoft.Extensions.Identity.Stores" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.HttpSys" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.IIS" />

eng/Version.Details.xml

@@ -9,25 +9,25 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="0.10.0-preview7.19310.1">
+    <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="0.10.0-preview7.19317.1">
       <Uri>https://github.com/aspnet/Blazor</Uri>
-      <Sha>fc20643ca2493c56180e4f5a00946116a3b6afdc</Sha>
+      <Sha>03f3e4a1a88037d9bbdd21334706ff147d616148</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview7.19316.1">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview7.19320.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>271045bfd76b339ab1c8b2555507ad727b068aa3</Sha>
+      <Sha>a399bd072e04f394de843ac100bd16fdd926a993</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview7.19316.1">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview7.19320.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>271045bfd76b339ab1c8b2555507ad727b068aa3</Sha>
+      <Sha>a399bd072e04f394de843ac100bd16fdd926a993</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview7.19316.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview7.19320.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>271045bfd76b339ab1c8b2555507ad727b068aa3</Sha>
+      <Sha>a399bd072e04f394de843ac100bd16fdd926a993</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview7.19316.1">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview7.19320.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>271045bfd76b339ab1c8b2555507ad727b068aa3</Sha>
+      <Sha>a399bd072e04f394de843ac100bd16fdd926a993</Sha>
     </Dependency>
     <Dependency Name="dotnet-ef" Version="3.0.0-preview7.19313.2">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>

eng/Versions.props

@@ -82,7 +82,7 @@
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19312.3</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from aspnet/Blazor -->
-    <MicrosoftAspNetCoreBlazorMonoPackageVersion>0.10.0-preview7.19310.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
+    <MicrosoftAspNetCoreBlazorMonoPackageVersion>0.10.0-preview7.19317.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
     <!-- Packages from aspnet/Extensions -->
     <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview7.19312.4</InternalAspNetCoreAnalyzersPackageVersion>
     <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview7.19312.4</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
@@ -154,10 +154,10 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview7.19313.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview7.19313.2</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview7.19316.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview7.19316.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview7.19316.1</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview7.19316.1</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview7.19320.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview7.19320.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview7.19320.3</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview7.19320.3</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--
 

eng/tools/RepoTasks/CreateFrameworkListFile.cs

@@ -0,0 +1,107 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace RepoTasks
+{
+    public class CreateFrameworkListFile : Task
+    {
+        /// <summary>
+        /// Files to extract basic information from and include in the list.
+        /// </summary>
+        [Required]
+        public ITaskItem[] Files { get; set; }
+
+        [Required]
+        public string TargetFile { get; set; }
+
+        /// <summary>
+        /// Extra attributes to place on the root node.
+        ///
+        /// %(Identity): Attribute name.
+        /// %(Value): Attribute value.
+        /// </summary>
+        public ITaskItem[] RootAttributes { get; set; }
+
+        public override bool Execute()
+        {
+            XAttribute[] rootAttributes = RootAttributes
+                ?.Select(item => new XAttribute(item.ItemSpec, item.GetMetadata("Value")))
+                .ToArray();
+
+            var frameworkManifest = new XElement("FileList", rootAttributes);
+
+            var usedFileProfiles = new HashSet<string>();
+
+            foreach (var f in Files
+                .Select(item => new
+                {
+                    Item = item,
+                    Filename = Path.GetFileName(item.ItemSpec),
+                    TargetPath = item.GetMetadata("TargetPath"),
+                    AssemblyName = FileUtilities.GetAssemblyName(item.ItemSpec),
+                    FileVersion = FileUtilities.GetFileVersion(item.ItemSpec),
+                    IsNative = item.GetMetadata("IsNativeImage") == "true",
+                    IsSymbolFile = item.GetMetadata("IsSymbolFile") == "true"
+                })
+                .Where(f =>
+                    !f.IsSymbolFile &&
+                    (f.Filename.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || f.IsNative))
+                .OrderBy(f => f.TargetPath, StringComparer.Ordinal)
+                .ThenBy(f => f.Filename, StringComparer.Ordinal))
+            {
+                var element = new XElement(
+                    "File",
+                    new XAttribute("Type", f.IsNative ? "Native" : "Managed"),
+                    new XAttribute(
+                        "Path",
+                        Path.Combine(f.TargetPath, f.Filename).Replace('\\', '/')));
+
+                if (f.AssemblyName != null)
+                {
+                    byte[] publicKeyToken = f.AssemblyName.GetPublicKeyToken();
+                    string publicKeyTokenHex;
+
+                    if (publicKeyToken != null)
+                    {
+                        publicKeyTokenHex = BitConverter.ToString(publicKeyToken)
+                            .ToLowerInvariant()
+                            .Replace("-", "");
+                    }
+                    else
+                    {
+                        Log.LogError($"No public key token found for assembly {f.Item.ItemSpec}");
+                        publicKeyTokenHex = "";
+                    }
+
+                    element.Add(
+                        new XAttribute("AssemblyName", f.AssemblyName.Name),
+                        new XAttribute("PublicKeyToken", publicKeyTokenHex),
+                        new XAttribute("AssemblyVersion", f.AssemblyName.Version));
+                }
+                else if (!f.IsNative)
+                {
+                    // This file isn't managed and isn't native. Leave it off the list.
+                    continue;
+                }
+
+                element.Add(new XAttribute("FileVersion", f.FileVersion));
+
+                frameworkManifest.Add(element);
+            }
+
+            Directory.CreateDirectory(Path.GetDirectoryName(TargetFile));
+            File.WriteAllText(TargetFile, frameworkManifest.ToString());
+
+            return !Log.HasLoggedErrors;
+        }
+    }
+}

eng/tools/RepoTasks/FileUtilities.cs

@@ -7,41 +7,42 @@
 using System.IO;
 using System.Reflection;
 
-namespace Microsoft.DotNet.Build.Tasks
+namespace RepoTasks
 {
-    internal static class FileUtilities
+    internal static partial class FileUtilities
     {
+        private static readonly HashSet<string> s_assemblyExtensions = new HashSet<string>(
+            new[] { ".dll", ".exe", ".winmd" },
+            StringComparer.OrdinalIgnoreCase);
+
         public static Version GetFileVersion(string sourcePath)
         {
             var fvi = FileVersionInfo.GetVersionInfo(sourcePath);
 
-            return fvi != null
-                ? new Version(fvi.FileMajorPart, fvi.FileMinorPart, fvi.FileBuildPart, fvi.FilePrivatePart)
-                : null;
-        }
-
-        private static readonly HashSet<string> _assemblyExtensions = new HashSet<string>(new[] { ".dll", ".exe", ".winmd" }, StringComparer.OrdinalIgnoreCase);
-
-        public static Version TryGetAssemblyVersion(string sourcePath)
-        {
-            var extension = Path.GetExtension(sourcePath);
+            if (fvi != null)
+            {
+                return new Version(fvi.FileMajorPart, fvi.FileMinorPart, fvi.FileBuildPart, fvi.FilePrivatePart);
+            }
 
-            return _assemblyExtensions.Contains(extension)
-                ? GetAssemblyVersion(sourcePath)
-                : null;
+            return null;
         }
 
-        private static Version GetAssemblyVersion(string sourcePath)
+        public static AssemblyName GetAssemblyName(string path)
         {
+            if (!s_assemblyExtensions.Contains(Path.GetExtension(path)))
+            {
+                return null;
+            }
+
             try
             {
-                return AssemblyName.GetAssemblyName(sourcePath)?.Version;
+                return AssemblyName.GetAssemblyName(path);
             }
             catch (BadImageFormatException)
             {
-                // If an .dll file cannot be read, it may be a native .dll which would not have an assembly version.
+                // Not a valid assembly.
                 return null;
             }
         }
     }
-}
+}

eng/tools/RepoTasks/GenerateSharedFrameworkDepsFile.cs

@@ -10,7 +10,6 @@
 using System.Text;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using Microsoft.DotNet.Build.Tasks;
 using Microsoft.Extensions.DependencyModel;
 
 namespace RepoTasks
@@ -61,7 +60,7 @@ private void ExecuteCore()
                 var filePath = reference.ItemSpec;
                 var fileName = Path.GetFileName(filePath);
                 var fileVersion = FileUtilities.GetFileVersion(filePath)?.ToString() ?? string.Empty;
-                var assemblyVersion = FileUtilities.TryGetAssemblyVersion(filePath);
+                var assemblyVersion = FileUtilities.GetAssemblyName(filePath)?.Version;
                 if (assemblyVersion == null)
                 {
                     var nativeFile = new RuntimeFile(fileName, null, fileVersion);

eng/tools/RepoTasks/RepoTasks.tasks

@@ -8,5 +8,6 @@
   <UsingTask TaskName="RepoTasks.GenerateGuid" AssemblyFile="$(_RepoTaskAssembly)" Condition="'$(MSBuildRuntimeType)' != 'core'" />
   <UsingTask TaskName="RepoTasks.GetMsiProperty" AssemblyFile="$(_RepoTaskAssembly)" Condition="'$(MSBuildRuntimeType)' != 'core'" />
   <UsingTask TaskName="RepoTasks.GenerateSharedFrameworkDepsFile" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.CreateFrameworkListFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.RemoveSharedFrameworkDependencies" AssemblyFile="$(_RepoTaskAssembly)" />
 </Project>