diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 75523c57207c..96af3a51b417 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -340,7 +340,7 @@ stages:
displayName: Build Arm64 Installers
# A few files must also go to the VS package feed.
- - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+ - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['PostBuildSign'], 'true')) }}:
- task: NuGetCommand@2
displayName: Push Visual Studio packages
inputs:
diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index d26efeb0a870..6e328a46626d 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -2,11 +2,17 @@
pr: none
trigger: none
schedules:
+# Cron timezone is UTC.
- cron: "0 */12 * * *"
branches:
include:
- master
always: true
+- cron: "0 9 * * *"
+ branches:
+ include:
+ - release/5.0
+ always: false
variables:
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 30dfaf8e52f8..18d7addb5d69 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -107,18 +107,14 @@ jobs:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
${{ if eq(parameters.agentOs, 'Windows') }}:
+ # Visual Studio Enterprise contains some stuff, like SQL Server and IIS Express, that we use for testing.
+ # But, we don't have a BuildTools option (even for public builds) while using the .Pre queues.
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
- ${{ if ne(parameters.isTestingJob, true) }}:
- # Visual Studio Build Tools
- queue: BuildPool.Server.Amd64.VS2019.BT.Open
- ${{ if eq(parameters.isTestingJob, true) }}:
- # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
- queue: BuildPool.Server.Amd64.VS2019.Open
+ queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool
- # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
- queue: BuildPool.Server.Amd64.VS2019
+ queue: BuildPool.Windows.10.Amd64.VS2019.Pre
${{ if ne(parameters.container, '') }}:
container: ${{ parameters.container }}
variables:
diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
index c9fc3cd7af62..126ebb1350af 100644
--- a/.azure/pipelines/quarantined-pr.yml
+++ b/.azure/pipelines/quarantined-pr.yml
@@ -28,8 +28,8 @@ pr:
autoCancel: true
branches:
include:
- - release/5.0
- master
+ - release/5.0
paths:
exclude:
- .github/*
diff --git a/AspNetCore.sln b/AspNetCore.sln
index 5587d5635b95..15bd7d93fa0b 100644
--- a/AspNetCore.sln
+++ b/AspNetCore.sln
@@ -861,18 +861,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSoc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Microbenchmarks", "src\Middleware\perf\ResponseCaching.Microbenchmarks\Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj", "{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MusicStore", "MusicStore", "{884AED21-7931-42A3-B08A-E58F7B0D6E7F}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8DA88110-5A13-41A9-9F9D-674D921EB442}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "src\MusicStore\samples\MusicStore\MusicStore.csproj", "{4BCF2228-159D-4547-8D54-CDD2252D076A}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2D347127-3B13-47B1-84EC-770A9C1E11B0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.Test", "src\MusicStore\test\MusicStore.Test\MusicStore.Test.csproj", "{A7802482-55BA-4D95-BE79-8A601131F527}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.E2ETests", "src\MusicStore\test\MusicStore.E2ETests\MusicStore.E2ETests.csproj", "{81947277-035F-41F6-A1D4-8EA362CB46D2}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicrosoftAccount", "MicrosoftAccount", "{8C4006DF-FF48-46B6-A124-10B1EEAA266E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.MicrosoftAccount", "src\Security\Authentication\MicrosoftAccount\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj", "{F5C54062-B19C-4291-A816-F1B5A167369A}"
diff --git a/Directory.Build.props b/Directory.Build.props
index cf46dcc2f24f..5c05a129e168 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,14 +11,23 @@
$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))
- true
+ true
true
false
- true
- true
- true
+ true
+ true
+ true
true
- false
+ false
- true
$(WarningsNotAsErrors);CS1591
@@ -207,6 +215,7 @@
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 98d5d0185ce9..d72060d66c49 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,8 +37,8 @@
$(VersionPrefix)
$(PackageBrandingVersion) $(BrandingVersionSuffix.Trim())
- $(VersionPrefix)
- $(VersionPrefix)-$(VersionSuffix.Replace('.','-'))
+ $(VersionPrefix)
+ $(VersionPrefix)-$(VersionSuffix.Replace('.','-'))
$(Version)
@@ -49,7 +49,7 @@
$(SharedFxVersion)
$(TargetingPackVersionPrefix)
- $(SiteExtensionPackageVersion)
+ $(SiteExtensionVersion)
@@ -57,11 +57,6 @@
true
-
-
- win-x64;win-x86
-
-
$(AssemblyName)
- true
+ true
- true
+ true
true
@@ -149,34 +151,20 @@
$(DefaultNetCoreTargetFramework)
- netcoreapp$(TargetFrameworkVersion.TrimStart('vV'))
+ <_DefaultTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('$(DefaultNetCoreTargetFramework)'))
+ <_DefaultTargetFrameworkVersionNoV>$([MSBuild]::GetTargetFrameworkVersion('$(DefaultNetCoreTargetFramework)', 2))
+ netcoreapp$(_DefaultTargetFrameworkVersionNoV)
+
+
+ false
+ true
-
-
- $(MicrosoftNETCoreAppRuntimeVersion)
-
- $(MicrosoftNETCoreAppRuntimeVersion)
-
- $(MicrosoftNETCoreAppRefPackageVersion)
-
-
-
-
- $(SharedFxVersion)
- $(SharedFxVersion)
- $(TargetingPackVersion)
-
-
-
-
@@ -193,6 +181,7 @@
+
diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md
index 73bd87d4791d..c2eda3a61ab4 100644
--- a/docs/BuildErrors.md
+++ b/docs/BuildErrors.md
@@ -1,33 +1,96 @@
-Build Errors
-------------
+# Build Errors
This document is for common build errors and how to resolve them.
-### Warning BUILD001
+## Warning BUILD001
-> warning BUILD001: Package references changed since the last release...
+> warning BUILD001: Reference to '…' was removed since the last stable release of this package. …
This warning indicates a breaking change might have been made to a package or assembly due to the removal of a reference which was used
-in a previous release of this assembly. See <./ReferenceResolution.md> for how to suppress.
+in a previous release of this assembly. See [ReferenceResolution](./ReferenceResolution.md) for how to suppress.
-### Error BUILD002
+## Error BUILD002
-> error BUILD002: Package references changed since the last release...
+> error BUILD002: Package references changed since the last release…
-Similar to BUILD001, but this error is not suppressable. This error only appears in servicing builds, which should not change references between assemblies or packages.
+Similar to BUILD001, but this error is not suppressible. This error only appears in servicing builds, which should not change references between assemblies or packages.
-### Error BUILD003
+## Error BUILD003
> error BUILD003: Multiple project files named 'Banana.csproj' exist. Project files should have a unique name to avoid conflicts in build output.
-This repo uses a common output directory (artifacts/bin/$(ProjectName) and artifacts/obj/$(ProjectName)). To avoid confllicts in build output, each
+This repo uses a common output directory (artifacts/bin/$(ProjectName) and artifacts/obj/$(ProjectName)). To avoid conflicts in build output, each
project file should have a unique name.
-### Error MSB4236 / Unable to locate the .NET Core SDK
-
+## Error CS0006
+
+Opening solution filters and building may produce an error code CS0006 with a message such as
+
+> Error CS0006 Metadata file '…\AspNetCore\artifacts\bin\Microsoft.AspNetCore.Metadata\Debug\netstandard2.0\Microsoft.AspNetCore.Metadata.dll' could not be found
+
+The cause of this problem is that the solution filter you are using does not include the project that produces this .dll. This most often occurs after we have added new projects to the repo, but failed to update our .sln/slnf files to include the new project. In some cases, it is sometimes the intended behavior of the .slnf which has been crafted to only include a subset of projects.
+
+### You can fix this in one of three ways
+
+1. Build the project on command line. In most cases, running `build.cmd` on command line solves this problem.
+2. If the project is missing from the .sln file entirely, you can use `dotnet sln add` to add it, or else right click on the solution/folder in Visual Studio and choose Add->Existing Project, and adding it.
+3. If it is present in the .sln, but not the .slnf, you can update the solution filter to include the missing project. You can either do this one by right-clicking on project in Visual Studio and choosing to load it's direct dependencies, and then saving. Alternatively, you can hand edit the .slnf file - it's a fairly simple json format.
+
+## Error MSB4019: The imported project "…\artifacts\bin\GenerateFiles\Directory.Build.props" was not found
+
+You have likely attempted to use `dotnet` to build a project in the repo without first generating the required files.
+Prior to building without `.\build.cmd` or `./build.sh` at least the following **must** be executed:
+
+```powershell
+.\build.cmd -noBuildNative -noBuildManaged
+```
+
+or
+
+```bash
+./build.sh --no-build-managed
+```
+
+## Error MSB4236: Unable to locate the .NET Core SDK
+
Executing `.\restore.cmd` or `.\build.cmd` may produce these errors:
> error : Unable to locate the .NET Core SDK. Check that it is installed and that the version specified in global.json (if any) matches the installed version.
> error MSB4236: The SDK 'Microsoft.NET.Sdk' specified could not be found.
In most cases, this is because the option _Use previews of the .NET Core SDK_ in VS2019 is not checked. Start Visual Studio, go to _Tools > Options_ and check _Use previews of the .NET Core SDK_ under _Environment > Preview Features_.
+
+## Error: HTTP Error 500.33 - ANCM Request Handler Load Failure
+
+The [ASP.NET Core Module](https://docs.microsoft.com/aspnet/core/host-and-deploy/aspnet-core-module) (ANCM) for IIS is not supported when running projects in this repository.
+
+After using `startvs.cmd` to open a solution in Visual Studio, the Kestrel web host option must be used (name of the project) and not IIS Express.
+
+Example of running the `MvcSandbox` project:
+
+`.\startvs.cmd .\src\Mvc\Mvc.sln`
+
+
+
+## Error: Unable to load the service index for …
+
+When attempting to restore servicing tags e.g. `v3.1.7`, the NuGet.config file may contain internal feeds that are not accessible. This will result in errors such as
+
+> …\aspnetcore\.dotnet\sdk\3.1.103\NuGet.targets(123,5): error : Unable to load the service index for source https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-784b0ffa/nuget/v3/index.json. […\Temp\1gsd3rdo.srb\restore.csproj] […\.nuget\packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.20213.4\tools\Tools.proj]
+
+The `darc-int-...` feeds in NuGet.config are used only when building internally and are not needed after the tags are created. Delete all such entries in the file and retry.
+
+## Warning: Requested Microsoft.AspNetCore.App v… does not exist
+
+You have likely attempted to build projects or execute tests which require the just-build Microsoft.AspNetCore.App
+shared framework. Execute the following to ensure that exists within the `$(DOTNET_ROOT)` folder:
+
+```powershell
+.\build.cmd -projects src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj
+```
+
+or
+
+```bash
+./build.sh --projects "$PWD/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj"
+```
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index 886a012b3a79..7f44c8d58b3d 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -15,13 +15,13 @@ This tutorial assumes that you are familiar with:
ASP.NET Core uses git submodules to include the source from a few other projects. In order to pull the sources of the these submodules when cloning the repo, be sure to pass the `--recursive` flag to the `git clone` command.
-```ps1
+```powershell
git clone --recursive https://github.com/dotnet/aspnetcore
```
If you've already cloned the aspnetcore repo without fetching subdmoule sources, you can fetch them after cloning by running the following command.
-```ps1
+```powershell
git submodule update --init --recursive
```
@@ -45,61 +45,63 @@ Visual Studio 2019 (16.8) is required to build the repo locally. If you don't ha
> :bulb: To install Visual Studio from the preview channel, you can use the `-Channel` flag to set the channel (`-Channel Preview`).
> :bulb: Even if you have installed Visual Studio, we still recommend using this script to install again to avoid errors due to missing components.
-```ps1
-PS> ./eng/scripts/InstallVisualStudio.ps1 [-Edition {Enterprise|Community|Professional}] [-Channel {Release|Preview}]
+```powershell
+./eng/scripts/InstallVisualStudio.ps1 [-Edition {Enterprise|Community|Professional}] [-Channel {Release|Preview}]
```
> :bulb: To execute the setup script or other PowerShell scripts in the repo, you may need to update the execution policy on your machine.
> You can do so by running the `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser` command
-> in PowerShell. For more information on execution policies, you can read the [execution policy docs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy).
+> in PowerShell. For more information on execution policies, you can read the [execution policy docs](https://docs.microsoft.com/powershell/module/microsoft.powershell.security/set-executionpolicy).
The [global.json](/global.json) file specifies the minimum requirements needed to build using `msbuild`. The [eng/scripts/vs.json](/eng/scripts/vs.json) file provides a description of the components needed to build within VS. If you plan on developing in Visual Studio, you will need to have these components installed.
-> :bulb: The `IntallVisualStudio.ps1` script mentioned above reads from the `vs.json` file to determine what components to install.
+> :bulb: The `InstallVisualStudio.ps1` script mentioned above reads from the `vs.json` file to determine what components to install.
-#### [Git](https://git-scm.org)
+#### [Git](https://git-scm.org) on Windows
If you're reading this, you probably already have Git installed to support cloning the repo as outlined in Step 1.
-#### [NodeJS](https://nodejs.org)
+#### [NodeJS](https://nodejs.org) on Windows
-Building the repo requires version 10.14.2 or newer of Node. You can find installation executables for Node at https://nodejs.org.
+Building the repo requires version 10.14.2 or newer of Node. You can find installation executables for Node at .
-#### [Yarn](https://yarnpkg.com/)
+#### [Yarn](https://yarnpkg.com/) on Windows
-NodeJS installes the Node package manager (npm) by default. This repo depends on yarn, an alternate package manager for the Node ecosystem. You can install Yarn from the command line using the following command.
+NodeJS installs the Node package manager (npm) by default. This repo depends on Yarn, an alternate package manager for the Node ecosystem. You can install Yarn from the command line using the following command.
-```ps1
+```powershell
npm install -g yarn
```
-#### Java Development Kit in Windows*
+#### Java Development Kit on Windows
This repo contains some Java source code that depends on an install of the JDK v11 or newer. The JDK can be installed from either:
- * OpenJDK
- * Oracle's JDK
+
+- OpenJDK
+- Oracle's JDK
Alternatively, you can run [eng/scripts/InstallJdk.ps1](/eng/scripts/InstallJdk.ps1) to install a version of the JDK that will only be used in this repo.
-```ps1
-PS> ./eng/scripts/InstallJdk.ps1
+```powershell
+./eng/scripts/InstallJdk.ps1
```
The build should find any JDK 11 or newer installation on the machine as long as the `JAVA_HOME` environment variable is set. Typically, your installation will do this automatically. However, if it is not set you can set the environment variable manually:
- * Set `JAVA_HOME` to `RepoRoot/.tools/jdk/win-x64/` if you used the `InstallJdk.ps1` script.
- * Set `JAVA_HOME` to `C:/Program Files/Java/jdk/` if you installed the JDK globally.
+
+- Set `JAVA_HOME` to `RepoRoot/.tools/jdk/win-x64/` if you used the `InstallJdk.ps1` script.
+- Set `JAVA_HOME` to `C:/Program Files/Java/jdk/` if you installed the JDK globally.
#### Chrome
This repo contains a Selenium-based tests require a version of Chrome to be installed. Download and install it from .
-#### Wix (Optional)
+#### WiX (Optional)
-If you plan on working with the Windows installers defined in [src/Installers/Windows](../src/Installers/Windows), you will need to install the Wix toolkit from https://wixtoolset.org/releases/.
+If you plan on working with the Windows installers defined in [src/Installers/Windows](../src/Installers/Windows), you will need to install the WiX toolkit from .
### On macOS/Linux
-You can also build ASP.NET Core on macOS or Linux. macOS Sierra or newer is required if you're building on macOS. If you're building on Linux, your machine will need to meet the [.NET Core Linux preequisities](https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites).
+You can also build ASP.NET Core on macOS or Linux. macOS Sierra or newer is required if you're building on macOS. If you're building on Linux, your machine will need to meet the [.NET Core Linux prerequisites](https://docs.microsoft.com/dotnet/core/linux-prerequisites).
> :bulb: Be sure you have least 10 GB of disk space and a good Internet connection. The build scripts will download several tools and dependencies onto your machine.
@@ -107,42 +109,45 @@ You can also build ASP.NET Core on macOS or Linux. macOS Sierra or newer is requ
`curl` and `wget` are command line tools that can be used to download files from an HTTP server. Either utility will need to be installed in order to complete the setup. Typically, these will be included on your machine by default.
-If netier utility is installed, you can install curl (https://curl.haxx.se) or wget (https://www.gnu.org/software/wget).
+If neither utility is installed, you can install curl () or wget ().
-##### Git
+#### Git
If you've made it this far, you've already got `Git` installed. Sit back, relax, and move on to the next requirement.
#### [NodeJS](https://nodejs.org)
-Building the repo requires version 10.14.2 or newer of Node. You can find installation executables for Node at https://nodejs.org.
+Building the repo requires version 10.14.2 or newer of Node. You can find installation executables for Node at .
#### [Yarn](https://yarnpkg.com/)
-NodeJS installs the Node package manager (npm) by default. This repo depends on yarn, an alternate package manager for the Node ecosystem. You can install Yarn from the command line using the following command.
+NodeJS installs the Node package manager (npm) by default. This repo depends on Yarn, an alternate package manager for the Node ecosystem. You can install Yarn from the command line using the following command.
```bash
-$ npm install -g yarn
+npm install -g yarn
```
#### Java Development Kit
This repo contains some Java source code that depends on an install of the JDK v11 or newer. The JDK can be installed from either:
- * OpenJDK
- * Oracle's JDK
+
+- OpenJDK
+- Oracle's JDK
Similar to [the instructions above for Windows](#java-development-kit-in-windows), be sure that the the `JAVA_HOME` environment variable is set to the location of your Java installation.
## Step 3: Build the repo
-Before opening our .sln/.slnf files in Visual Studio or VS Code, you will need to build the repo locally.
+Before opening our .sln/.slnf files in Visual Studio or VS Code, you will need to at least restore the repo locally.
### In Visual Studio
-To set up your project for development on Visual Studio, you'll need to execute the following command.
+To set up your project for development on Visual Studio, you'll need to execute the following command. Building
+subsets of the repo e.g. Java projects may (depending on your scenario) be necessary before building within Visual
+Studio because those projects are not listed in AspNetCore.sln.
-```ps1
-PS1> .\restore.cmd
+```powershell
+.\restore.cmd
```
> :bulb: If you happen to be working on macOS or Linux, you can use the `restore.sh` command.
@@ -154,18 +159,21 @@ to open the .sln file or one of the project specific .slnf files to work on the
> branch, we regularly update the versions of .NET Core SDK required to build the repo.
> You will need to restart Visual Studio every time we update the .NET Core SDK.
-Typically, you want to focus on a single project within the monorepo. For example,
+> :bulb: Rerunning the above command or, perhaps, the quicker `.\build.cmd -noBuildNative -noBuildManaged` may be
+> necessary after switching branches, especially if the `$(DefaultNetCoreTargetFramework)` value changes.
+
+Typically, you want to focus on a single project within this large repo. For example,
if you want to work on Blazor WebAssembly, you'll need to launch the solution file for that project by changing into the `src/Components`
directory and executing `startvs.cmd` in that directory like so:
-```ps1
-PS1> cd src\Components
-PS1> .\startvs.cmd
+```powershell
+cd src\Components
+.\startvs.cmd
```
After opening the solution in Visual Studio, you can build/rebuild using the controls in Visual Studio.
-> :exclamation: VS for Mac does not currently support opening .slnf files so you must use VS Code when developing on macOS.
+> :exclamation: VS for Mac does not currently support opening .slnf files. So, you must use VS Code when developing on macOS.
#### A brief interlude on solution files
@@ -173,7 +181,7 @@ We have a single .sln file for all of ASP.NET Core, but most people don't work w
doesn't currently handle projects of this scale very well.
Instead, we have many Solution Filter (.slnf) files which include a sub-set of projects. See the Visual Studio
-documentation [here](https://docs.microsoft.com/en-us/visualstudio/ide/filtered-solutions?view=vs-2019) for more
+documentation [here](https://docs.microsoft.com/visualstudio/ide/filtered-solutions) for more
information about Solution Filters.
These principles guide how we create and manage .slnf files:
@@ -194,9 +202,8 @@ Use these command to launch VS Code with the right settings.
On Windows (requires PowerShell):
-```ps1
+```powershell
# The extra dot at the beginning is required to 'dot source' this file into the right scope.
-
. .\activate.ps1
code .
```
@@ -211,15 +218,15 @@ code .
> :bulb: Note that if you are using the "Remote-WSL" extension in VSCode, the environment is not supplied
> to the process in WSL. You can workaround this by explicitly setting the environment variables
> in `~/.vscode-server/server-env-setup`.
-> See https://code.visualstudio.com/docs/remote/wsl#_advanced-environment-setup-script for details.
+> See for details.
-## Building on command-line
+### Building on command-line
When developing in VS Code, you'll need to use the `build.cmd` or `build.sh` scripts in order to build the project. You can learn more about the command line options available, check out [the section below](using-dotnet-on-command-line-in-this-repo).
On Windows:
-```ps1
+```powershell
.\build.cmd
```
@@ -237,16 +244,15 @@ At this point, you will have all the dependencies installed and a code editor to
The section below provides some helpful guides for using the `dotnet` CLI in the ASP.NET Core repo.
-## Using `dotnet` on command line in this repo
+### Using `dotnet` on command line in this repo
Because we are using pre-release versions of .NET Core, you have to set a handful of environment variables
to make the .NET Core command line tool work well. You can set these environment variables like this:
On Windows (requires PowerShell):
-```ps1
+```powershell
# The extra dot at the beginning is required to 'dot source' this file into the right scope.
-
. .\activate.ps1
```
@@ -264,7 +270,7 @@ Tests are not run by default. Use the `-test` option to run tests in addition to
On Windows:
-```ps1
+```powershell
.\build.cmd -test
```
@@ -286,7 +292,7 @@ Furthermore, you can use flags on `build.cmd`/`.sh` to build subsets based on la
Additional properties can be added as an argument in the form `/property:$name=$value`, or `/p:$name=$value` for short. For example:
-```ps1
+```powershell
.\build.cmd -Configuration Release
```
@@ -298,14 +304,18 @@ Configuration | `Debug` or `Release`. Default = `Debug`.
TargetArchitecture | The CPU architecture to build for (x64, x86, arm, arm64).
TargetOsName | The base runtime identifier to build for (win, linux, osx, linux-musl).
-### Use the result of your build
+### Resx files
+
+If you need to make changes to a .resx file, run `dotnet msbuild t:/Resgen `. This will update the generated C#.
+
+## Step 5: Use the result of your build
After building ASP.NET Core from source, you will need to install and use your local version of ASP.NET Core.
See ["Artifacts"](./Artifacts.md) for more explanation of the different folders produced by a build.
Building installers does not run as part of `build.cmd` run without parameters, so you should opt-in for building them:
-```ps1
+```powershell
.\build.cmd -all -pack -arch x64
.\build.cmd -all -pack -arch x86 -noBuildJava
.\build.cmd -buildInstallers
@@ -313,8 +323,8 @@ Building installers does not run as part of `build.cmd` run without parameters,
*Note*: Additional build steps listed above aren't necessary on Linux or macOS.
-* Run the installers produced in `artifacts/installers/{Debug, Release}/` for your platform.
-* Add a NuGet.Config to your project directory with the following content:
+- Run the installers produced in `artifacts/installers/{Debug, Release}/` for your platform.
+- Add a NuGet.Config to your project directory with the following content:
```xml
@@ -329,7 +339,7 @@ Building installers does not run as part of `build.cmd` run without parameters,
*NOTE: This NuGet.Config should be with your application unless you want nightly packages to potentially start being restored for other apps on the machine.*
-* Update the versions on `PackageReference` items in your .csproj project file to point to the version from your local build.
+- Update the versions on `PackageReference` items in your .csproj project file to point to the version from your local build.
```xml
@@ -340,55 +350,6 @@ Building installers does not run as part of `build.cmd` run without parameters,
Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio.
These are available in the [Visual Studio Preview](https://www.visualstudio.com/vs/preview/).
-## Resx files
-
-If you need to make changes to a .resx file, run `dotnet msbuild t:/Resgen `. This will update the generated C#.
-
## Troubleshooting
-This section contains a troubleshooting guide for common issues you might run into while building the repo.
-
-### Common error: CS0006
-
-Opening solution filters and building may produce an error code CS0006 with a message such
-
-> Error CS0006 Metadata file 'C:\src\aspnet\AspNetCore\artifacts\bin\Microsoft.AspNetCore.Metadata\Debug\netstandard2.0\Microsoft.AspNetCore.Metadata.dll' could not be found
-
-The cause of this problem is that the solution filter you are using does not include the project that produces this .dll. This most often occurs after we have added new projects to the repo, but failed to update our .sln/slnf files to include the new project. In some cases, it is sometimes the intended behavior of the .slnf which has been crafted to only include a subset of projects.
-
-#### You can fix this in one of three ways
-
-1. Build the project on command line. In most cases, running `build.cmd` on command line solves this problem.
-2. If the project is missing from the .sln file entirely, you can use `dotnet sln add` to add it, or else right click on the solution/folder in Visual Studio and choose Add->Existing Project, and adding it.
-3. If it is present in the .sln, but not the .slnf, you can update the solution filter to include the missing project. You can either do this one by right-clicking on project in Visual Studio and choosing to load it's direct dependencies, and then saving. Alternatively, you can hand edit the .slnf file - it's a fairly simple json format.
-
-### Common error: Unable to locate the .NET Core SDK
-
-Executing `.\restore.cmd` or `.\build.cmd` may produce these errors:
-
-> error : Unable to locate the .NET Core SDK. Check that it is installed and that the version specified in global.json (if any) matches the installed version.
-> error MSB4236: The SDK 'Microsoft.NET.Sdk' specified could not be found.
-
-In most cases, this is because the option _Use previews of the .NET Core SDK_ in VS2019 is not checked. Start Visual Studio, go to _Tools > Options_ and check _Use previews of the .NET Core SDK_ under _Environment > Preview Features_.
-
-### Common error: HTTP Error 500.33 - ANCM Request Handler Load Failure
-
-The [ASP.NET Core Module](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/aspnet-core-module) (ANCM) for IIS is not supported when running projects in this repository.
-
-After using `startvs.cmd` to open a solution in Visual Studio, the Kestrel web host option must be used (name of the project) and not IIS Express.
-
-Example of running the `MvcSandbox` project:
-
-`.\startvs.cmd .\src\Mvc\Mvc.sln`
-
-
-
-### Common error: error : Unable to load the service index for …
-
-When attempting to restore servicing tags e.g. `v3.1.7`, the NuGet.config file may contain internal feeds that are not accessible. This will result in errors such as
-
-``` text
-...\aspnetcore\.dotnet\sdk\3.1.103\NuGet.targets(123,5): error : Unable to load the service index for source https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-784b0ffa/nuget/v3/index.json. [...\Temp\1gsd3rdo.srb\restore.csproj] [...\.nuget\packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.20213.4\tools\Tools.proj]
-```
-
-The `darc-int-...` feeds in NuGet.config are used only when building internally and are not needed after the tags are created. Delete all such entries in the file and retry.
+See [BuildErrors](./BuildErrors.md) for a description of common issues you might run into while building the repo.
diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md
index 8e94b2a86589..cd8c706e1e3e 100644
--- a/docs/ReferenceResolution.md
+++ b/docs/ReferenceResolution.md
@@ -54,7 +54,7 @@ Steps for adding a new package dependency to an existing project. Let's say I'm
1. Add the package to the .csproj file using ``
2. Add an entry to [eng/Dependencies.props](/eng/Dependencies.props) e.g. ``
3. If this package comes from another dotnet team and should be updated automatically by our bot…
- 1. Add an entry to [eng/Versions.props](/eng/Versions.props) like this `0.0.1-beta-1`.
+ 1. Add an entry to [eng/Versions.props](/eng/Versions.props) like this `0.0.1-beta-1`.
2. Add an entry to [eng/Version.Details.xml](/eng/Version.Details.xml) like this:
```xml
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index c4fca144a653..fa0cfea3db10 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,694 +2,900 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 3.1.9
+ 5.0.0
-
-
- 3.0.3
+
+
+ 5.0.0
-
-
- 3.0.3
+
+
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
- 3.2.1
-
-
-
-
- 3.1.9
-
-
-
-
-
-
-
-
-
-
-
-
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
- 3.1.9
+ 5.0.0
+
+
+
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
+
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
- 3.1.9
-
-
-
-
-
-
- 3.1.9
+ 5.0.0
-
-
-
-
-
-
-
-
-
-
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
-
-
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- 3.2.1
+
+
+ 5.0.0
-
-
-
-
-
-
+
+
+
-
-
- 3.2.1
+
+
+ 5.0.0
-
-
-
- 3.2.1
+ 5.0.0
-
-
- 3.2.1
+
+
+ 5.0.0
-
-
-
+
+
+
+
+
+
-
-
- 3.2.1
-
-
-
- 3.2.1
+
+
+ 5.0.0
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
+
+
+
-
-
-
+
+
-
-
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
+
+
-
-
+
+
-
-
-
-
- 3.1.9
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- 3.1.9
-
-
-
- 3.1.9
-
-
-
-
-
-
-
-
- 3.1.9
+ 5.0.0
-
-
-
-
-
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
+
+
+
+
-
-
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
-
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
+
+
+
+
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
+
+
+
+
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
-
-
-
-
-
- 3.1.9
-
-
-
-
-
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
+
+
+ 5.0.0
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
-
-
-
- 3.1.9
-
-
-
-
+
+
+
+
- 3.1.9
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+ 5.0.0
+
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
-
-
-
-
-
- 3.1.9
-
-
-
-
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
- 3.1.9
+ 5.0.0
-
-
+
+
+
+
+
-
+
- 3.1.9
+ 5.0.0
+
+
+
+
-
-
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
-
+
- 3.1.9
+ 5.0.0
-
-
-
-
-
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
-
-
- 3.1.9
-
-
-
-
- 3.1.9
+ 5.0.0
-
-
-
+
+
- 3.1.9
+ 5.0.0
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+
+ 5.0.0
-
-
+
+
+
+
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
- 3.1.9
+
+
+ 5.0.0
-
-
- 3.1.9
+
+
+ 5.0.0
- 3.1.9
+ 5.0.0
- 3.1.9
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
- 3.1.9
+ 5.0.0
-
-
-
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
- 3.1.9
+ 5.0.0
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+ 5.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0.0
+
+
+
+
+
+ 5.0.0
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 0130dad26383..6c63e0b86c92 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -1,90 +1,108 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/Build.props b/eng/Build.props
index 1333471df20c..1189349f53bd 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -21,13 +21,17 @@
$(RepoRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
$(RepoRoot)src\Tools\Tests.Common\TestProjects\**\*.csproj;
$(RepoRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj;
+ $(RepoRoot)src\Razor\test\testassets\**\*.*proj;
+ $(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
+ $(RepoRoot)src\Components\WebAssembly\Sdk\testassets\**\*.csproj;
+ " />
+
+
+
@@ -176,8 +180,6 @@
Exclude="
@(ProjectToBuild);
@(ProjectToExclude);
- $(RepoRoot)src\Razor\test\testassets\**\*.*proj;
- $(RepoRoot)src\Components\WebAssembly\Sdk\testassets\**\*.*proj;
$(RepoRoot)**\node_modules\**\*;
$(RepoRoot)**\bin\**\*;
$(RepoRoot)**\obj\**\*;"
@@ -214,7 +216,6 @@
Exclude="
@(ProjectToBuild);
@(ProjectToExclude);
- $(RepoRoot)src\Razor\test\testassets\**\*.*proj;
$(RepoRoot)**\node_modules\**\*;
$(RepoRoot)**\bin\**\*;
$(RepoRoot)**\obj\**\*;"
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 07684202d905..1484df08a4bf 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -196,7 +196,7 @@ and are generated based on the last package release.
- $(%(VersionName)PackageVersion)
+ $(%(VersionName)Version)
- $(DefaultNetCoreTargetFramework)
- true
- artifacts\manifests\
- true
-
-
- 3650
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
index a43f82e80353..93c87f9d9776 100644
--- a/eng/SharedFramework.External.props
+++ b/eng/SharedFramework.External.props
@@ -7,41 +7,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
- <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
- <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
- <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
- <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
- <_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2f3b37f9a2bb..0f2dc2c07ff7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,321 +9,317 @@
-->
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/efcore
- 27ea2d6c6614e6d452970f25752540e28c5c01f1
+ f4628ea869b971fdbeadab8890d46be192e0af89
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
-
-
- https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/runtime
- 5aaf0c14c236a771e0460c963b5353300c029dd1
+ 72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/arcade
- 19e7e769f7ca2ece42221f7ff951e7ec705498ec
+ e65d307045c183af6e48b087571f6b7a05e39f01
-
+
https://github.com/dotnet/arcade
- 19e7e769f7ca2ece42221f7ff951e7ec705498ec
+ e65d307045c183af6e48b087571f6b7a05e39f01
-
+
https://github.com/dotnet/arcade
- 19e7e769f7ca2ece42221f7ff951e7ec705498ec
+ e65d307045c183af6e48b087571f6b7a05e39f01
diff --git a/eng/Versions.props b/eng/Versions.props
index 1a33587c2f50..87f2a5a25f58 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,7 +23,10 @@
true
$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion)
-
+
$(VersionPrefix)
$(AspNetCoreMajorMinorVersion).0
@@ -61,85 +64,84 @@
-->
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
- 6.0.0-alpha.1.20555.8
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
+ 6.0.0-alpha.1.20560.10
- 6.0.0-alpha.1.20555.8
+ 6.0.0-alpha.1.20560.10
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
- 6.0.0-alpha.1.20556.4
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
+ 6.0.0-alpha.1.20563.8
- 6.0.0-beta.20529.1
+ 6.0.0-beta.20561.5
- $(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
+ $(MicrosoftNETCoreAppRuntimewinx64Version)
- 3.8.0-3.20458.6
+ 3.8.0-5.20519.18
- 5.0.0-preview.4.20180.4
+ 5.0.0-preview.4.20180.4
- 3.0.0-build-20190530.3
- 1.0.0-beta-64023-03
+ 3.0.0-build-20190530.3
15.9.3032
- 4.7.0
- 2.0.3
- 4.5.0
- 4.4.0
- 0.3.0-alpha.19317.1
- 4.3.0
- 4.3.4
- 4.3.0
- 4.3.0
- 4.5.3
- 4.5.0
+ 4.7.0
+ 2.0.3
+ 4.5.0
+ 4.4.0
+ 0.3.0-alpha.19317.1
+ 4.3.0
+ 4.3.4
+ 4.3.0
+ 4.3.0
+ 4.5.3
+ 4.5.0
- 1.10.0
- 5.2.6
- 3.1.1-preview4.19614.4
+ 1.10.0
+ 5.2.6
+ 3.1.1-preview4.19614.4
- 1.0.0
- 15.8.166
- 1.2.0
- 15.8.166
- 1.2.6
- 15.8.166
- 3.7.0
- 3.7.0
- 3.7.0
- 3.3.0
- 3.0.0
- 1.0.0-20200708.1
- 3.19.8
- 6.7.1
- 6.7.1
- 6.7.1
- 2.2.1
- 1.0.1
- 3.0.1
- 3.0.1
- 11.1.0
- 1.4.0
- 6.7.1
- 5.7.0
+ 1.0.0
+ 15.8.166
+ 1.2.0
+ 15.8.166
+ 1.2.6
+ 15.8.166
+ 3.7.0
+ 3.7.0
+ 3.7.0
+ 3.3.0
+ 3.0.0
+ 1.0.0-20200708.1
+ 3.19.8
+ 6.7.1
+ 6.7.1
+ 6.7.1
+ 2.2.1
+ 1.0.1
+ 3.0.1
+ 3.0.1
+ 11.1.0
+ 1.4.0
+ 6.7.1
+ 5.7.0
- 2.1.1
- 2.2.0
- 3.1.9-servicing-20473-9
- $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
- $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
- 5.0.0-preview-7-20365-19
- $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)
- $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)
+ 2.1.1
+ 2.2.0
+ 3.1.10-servicing-20520-4
+ $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
+ $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
+ 5.0.0-rtm-20529-7
+ $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
+ $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
- 0.9.9
- 0.12.1
- 4.2.1
- 2.3.0
- 4.2.1
- 3.13.0
- 2.32.0
- 2.32.0
- 2.32.0
- 2.32.0
- 4.1.0
- 4.1.0
- 4.1.0
- 4.1.0
- 4.1.0
- 2.1.90
- 1.1.0
- 1.1.0
- 1.1.0
- $(MessagePackPackageVersion)
- 4.10.0
- 0.11.2
- 1.0.2
- 12.0.2
- 13.0.4
- 4.0.0-alpha05
- 17.17134.0
- 86.0.4240.2200-beta
- 4.0.0-alpha05
- 1.4.0
- 4.0.0
- 2.0.593
- 3.1.1
- 5.6.3
- 2.0.3
- 0.10.0
+ 0.9.9
+ 0.12.1
+ 4.2.1
+ 2.3.0
+ 4.2.1
+ 3.13.0
+ 2.32.0
+ 2.32.0
+ 2.32.0
+ 2.32.0
+ 4.1.0
+ 4.1.0
+ 4.1.0
+ 4.1.0
+ 4.1.0
+ 2.1.90
+ 1.1.0
+ 1.1.0
+ 1.1.0
+ $(MessagePackVersion)
+ 4.10.0
+ 0.11.2
+ 1.0.2
+ 12.0.2
+ 13.0.4
+ 4.0.0-alpha05
+ 17.17134.0
+ 86.0.4240.2200-beta
+ 4.0.0-alpha05
+ 1.4.0
+ 4.0.0
+ 2.0.593
+ 3.1.1
+ 5.6.3
+ 2.0.3
+ 0.10.0
2.4.1
- $(XunitVersion)
- $(XunitVersion)
- $(XunitVersion)
+ $(XunitVersion)
+ $(XunitVersion)
+ $(XunitVersion)
2.4.3
- 1.0.19249.1
+ 1.0.19249.1
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 8b31bd01c0a4..ce40da6d759a 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -1,18 +1,12 @@
-
-
- 6.0
-
-
+ TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
-
-
-
-
-
-
-
+
diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj
index 79a5486546ea..cf09e40578a5 100644
--- a/eng/common/performance/crossgen_perf.proj
+++ b/eng/common/performance/crossgen_perf.proj
@@ -68,9 +68,9 @@
$(WorkItemDirectory)
- $(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity)
- $(Python) test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/
- $(Python) post.py
+ $(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity)
+ $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/
+ $(Python) $(CrossgenDirectory)post.py
@@ -78,8 +78,8 @@
$(WorkItemDirectory)
$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity)
- $(Python) test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/
- $(Python) post.py
+ $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/
+ $(Python) $(Crossgen2Directory)post.py
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index 656c0bd9022c..0edb2ae276ed 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -82,7 +82,9 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch
#This grabs the LKG version number of dotnet and passes it to our scripts
$VersionJSON = Get-Content global.json | ConvertFrom-Json
$DotNetVersion = $VersionJSON.tools.dotnet
-$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
+# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
+# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
+$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments"
if ($RunFromPerformanceRepo) {
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 9c0f6c909145..315815a96777 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -223,7 +223,9 @@ if [[ "$use_latest_dotnet" = false ]]; then
# Get the tools section from the global.json.
# This grabs the LKG version number of dotnet and passes it to our scripts
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
- setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
+ # TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
+ # setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
+ setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments"
fi
if [[ "$run_from_perf_repo" = true ]]; then
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 650b13b089b2..31cf27674171 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -10,6 +10,7 @@ param(
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
+ [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
)
@@ -25,6 +26,11 @@ try {
$optionalParams.Add($ArtifactsPublishingAdditionalParameters) | Out-Null
}
+ if ("" -ne $SymbolPublishingAdditionalParameters) {
+ $optionalParams.Add("symbol-publishing-parameters") | Out-Null
+ $optionalParams.Add($SymbolPublishingAdditionalParameters) | Out-Null
+ }
+
if ("false" -eq $WaitPublishingFinish) {
$optionalParams.Add("--no-wait") | Out-Null
}
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 06048c27907b..866967934802 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,7 +24,6 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
- useBuildManifest: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
@@ -243,12 +242,3 @@ jobs:
ArtifactName: AssetManifests
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-
- - ${{ if eq(parameters.useBuildManifest, true) }}:
- - task: PublishBuildArtifacts@1
- displayName: Publish Build Manifest
- inputs:
- PathToPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/manifest.props'
- PublishLocation: Container
- ArtifactName: BuildManifests
- continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 761fb1a29c35..41f2d96a608c 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -32,7 +32,6 @@ parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
signingValidationAdditionalParameters: ''
- useBuildManifest: false
# Which stages should finish execution before post-build stages start
validateDependsOn:
@@ -54,9 +53,6 @@ parameters:
NETCoreExperimentalChannelId: 562
NetEngServicesIntChannelId: 678
NetEngServicesProdChannelId: 679
- Net5Preview8ChannelId: 1155
- Net5RC1ChannelId: 1157
- Net5RC2ChannelId: 1329
NetCoreSDK313xxChannelId: 759
NetCoreSDK313xxInternalChannelId: 760
NetCoreSDK314xxChannelId: 921
@@ -94,7 +90,7 @@ stages:
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
arguments: -PromoteToChannels "$(TargetChannels)"
- -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
+ -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
- job:
displayName: NuGet Validation
@@ -142,16 +138,6 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
- - ${{ if eq(parameters.useBuildManifest, true) }}:
- - task: DownloadBuildArtifacts@0
- displayName: Download build manifest
- inputs:
- buildType: specific
- buildVersionToDownload: specific
- project: $(AzDOProjectName)
- pipeline: $(AzDOPipelineId)
- buildId: $(AzDOBuildId)
- artifactName: BuildManifests
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
@@ -253,6 +239,7 @@ stages:
- job:
displayName: Publish Using Darc
dependsOn: setupMaestroVars
+ timeoutInMinutes: 120
variables:
- name: BARBuildId
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
@@ -269,6 +256,8 @@ stages:
-MaestroToken '$(MaestroApiAccessToken)'
-WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
+ -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+ -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
@@ -303,54 +292,6 @@ stages:
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
- - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net5_Preview8_Publish'
- channelName: '.NET 5 Preview 8'
- akaMSChannelName: 'net5/preview8'
- channelId: ${{ parameters.Net5Preview8ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net5_RC1_Publish'
- channelName: '.NET 5 RC 1'
- akaMSChannelName: 'net5/rc1'
- channelId: ${{ parameters.Net5RC1ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net5_RC2_Publish'
- channelName: '.NET 5 RC 2'
- akaMSChannelName: 'net5/rc2'
- channelId: ${{ parameters.Net5RC2ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
parameters:
BARBuildId: ${{ parameters.BARBuildId }}
diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1
index 94ab74ac8be9..509cdf84d685 100644
--- a/eng/scripts/CodeCheck.ps1
+++ b/eng/scripts/CodeCheck.ps1
@@ -110,7 +110,7 @@ try {
else {
$varName = $dep.Name -replace '\.',''
$varName = $varName -replace '\-',''
- $varName = "${varName}PackageVersion"
+ $varName = "${varName}Version"
$versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName")
$actualVersion = $versionVar.InnerText
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index babdae75f264..5da1b5c47d5d 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -6,32 +6,42 @@
.NETFramework
-
- <_TFMDirectory>$(TargetFramework)
- <_TFMDirectory Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">netcoreapp
+
+ true
+ false
$(NoWarn);RS0041
-
- $(NoWarn);CA1416
+
+ $(NoWarn);CA1416
-
+
+ Condition=" Exists('$(MSBuildProjectDirectory)\PublicAPI.Shipped.txt') AND ! $(AddPublicApiAnalyzers) ">
+
+
+ <_PublicAPIAnalyzers Include="@(Analyzer->WithMetadataValue('NuGetPackageId','Microsoft.CodeAnalysis.PublicApiAnalyzers'))" />
+
+
+
+
+
+
+
+
- call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalPackageVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)
- ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalPackageVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)
+ call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)
+ ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)
$(HelixCommand)
$(HelixTimeout)
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 696d23402b00..0604d1f0c036 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -122,8 +122,8 @@
$(PackageId)
$(PackageVersionForPackageVersionInfo)
$(VersionSuffix)
-
- $(PackageId.Replace('.',''))PackageVersion
+
+ $(PackageId.Replace('.',''))dVersion
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index aa4b272cba53..7bbcc6a94618 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -18,7 +18,7 @@
$(PackageId)
$(PackageVersionForPackageVersionInfo)
$(VersionSuffix)
- $(PackageId.Replace('.',''))PackageVersion
+ $(PackageId.Replace('.',''))Version
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 197491fd5a7e..9e3f81b89b2a 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -259,7 +259,7 @@
${DefaultNetCoreTargetFramework}
- ${DefaultNetCoreTargetFramework}
true
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
index aa4cd6cd297a..e6534f1161a1 100644
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -2,43 +2,65 @@
99.9
+
+ true
+
-
+ Condition="@(KnownAppHostPack->Count()) != '0' AND
+ !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))" />
+ Condition="@(KnownFrameworkReference->Count()) != '0' AND
+ !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))" />
-
+
+ Update="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->WithMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}'))"
+ LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}">
+
+ ${MicrosoftNETCoreAppRuntimeVersion}
+ ${MicrosoftNETCoreAppRefVersion}
+
-
+
-
+ Update="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->WithMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}'))"
+ Condition=" $(UpdateAspNetCoreKnownFramework) "
+ LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimeVersion}"
+ RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}">
+ ${MicrosoftAspNetCoreAppRuntimeVersion}
+ ${MicrosoftAspNetCoreAppRefVersion}
+
-
+
+
+
+
+
diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj
index 42bcca694b9f..f569e0913641 100644
--- a/eng/tools/GenerateFiles/GenerateFiles.csproj
+++ b/eng/tools/GenerateFiles/GenerateFiles.csproj
@@ -1,6 +1,7 @@
- $(DefaultNetCoreTargetFramework)
+
+ net5.0
@@ -9,11 +10,11 @@
<_TemplateProperties>
DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);
KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm);
- MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion);
- MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion);
- MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
+ MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion);
+ MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion);
+ MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion);
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
- MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
+ MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion);
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim())
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 656f8595f5ce..cc546cafc0de 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -8,6 +8,8 @@
true
false
+
+ false
diff --git a/global.json b/global.json
index 7ec3a15b603e..d53586778b01 100644
--- a/global.json
+++ b/global.json
@@ -7,10 +7,10 @@
"runtimes": {
"dotnet/x64": [
"2.1.18",
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
+ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
],
"dotnet/x86": [
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
+ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
],
"aspnetcore/x64": [
"3.1.4"
@@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20529.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20529.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20561.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20561.5"
}
}
diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/DiagnosticProject.cs b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/DiagnosticProject.cs
index 013bbf151c89..d390db41afb1 100644
--- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/DiagnosticProject.cs
+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/DiagnosticProject.cs
@@ -25,6 +25,7 @@ public class DiagnosticProject
///
public static string TestProjectName = "TestProject";
+ private static readonly ICompilationAssemblyResolver _assemblyResolver = new AppBaseCompilationAssemblyResolver();
private static readonly Dictionary _solutionCache = new Dictionary();
public static Project Create(Assembly testAssembly, string[] sources)
@@ -41,7 +42,7 @@ public static Project Create(Assembly testAssembly, string[] sources)
foreach (var defaultCompileLibrary in DependencyContext.Load(testAssembly).CompileLibraries)
{
- foreach (var resolveReferencePath in defaultCompileLibrary.ResolveReferencePaths(new AppLocalResolver()))
+ foreach (var resolveReferencePath in defaultCompileLibrary.ResolveReferencePaths(_assemblyResolver))
{
solution = solution.AddMetadataReference(projectId, MetadataReference.CreateFromFile(resolveReferencePath));
}
@@ -69,31 +70,5 @@ public static Project Create(Assembly testAssembly, string[] sources)
return solution.GetProject(testProject);
}
-
- // Required to resolve compilation assemblies inside unit tests
- private class AppLocalResolver : ICompilationAssemblyResolver
- {
- public bool TryResolveAssemblyPaths(CompilationLibrary library, List assemblies)
- {
- foreach (var assembly in library.Assemblies)
- {
- var dll = Path.Combine(Directory.GetCurrentDirectory(), "refs", Path.GetFileName(assembly));
- if (File.Exists(dll))
- {
- assemblies.Add(dll);
- return true;
- }
-
- dll = Path.Combine(Directory.GetCurrentDirectory(), Path.GetFileName(assembly));
- if (File.Exists(dll))
- {
- assemblies.Add(dll);
- return true;
- }
- }
-
- return false;
- }
- }
}
}
diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
index 46edeccc5b64..88ac17550a80 100644
--- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
@@ -5,10 +5,9 @@
netstandard2.0
$(PackageTags);testing
true
-
- $(NoWarn);CS1591
-
+
false
+ true
true
false
diff --git a/src/Antiforgery/src/PublicAPI.Shipped.txt b/src/Antiforgery/src/PublicAPI.Shipped.txt
index 7dc5c58110bf..575a0a0b8605 100644
--- a/src/Antiforgery/src/PublicAPI.Shipped.txt
+++ b/src/Antiforgery/src/PublicAPI.Shipped.txt
@@ -1 +1,33 @@
#nullable enable
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.AntiforgeryOptions() -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.Cookie.get -> Microsoft.AspNetCore.Http.CookieBuilder!
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.Cookie.set -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.get -> string!
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.set -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.get -> string?
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.set -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.get -> bool
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.set -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.AntiforgeryTokenSet(string? requestToken, string? cookieToken, string! formFieldName, string? headerName) -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.CookieToken.get -> string?
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.FormFieldName.get -> string!
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.HeaderName.get -> string?
+Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.RequestToken.get -> string?
+Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException
+Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException.AntiforgeryValidationException(string! message) -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException.AntiforgeryValidationException(string! message, System.Exception? innerException) -> void
+Microsoft.AspNetCore.Antiforgery.IAntiforgery
+Microsoft.AspNetCore.Antiforgery.IAntiforgery.GetAndStoreTokens(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet!
+Microsoft.AspNetCore.Antiforgery.IAntiforgery.GetTokens(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet!
+Microsoft.AspNetCore.Antiforgery.IAntiforgery.IsRequestValidAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Antiforgery.IAntiforgery.SetCookieTokenAndHeader(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> void
+Microsoft.AspNetCore.Antiforgery.IAntiforgery.ValidateRequestAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider
+Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider.GetAdditionalData(Microsoft.AspNetCore.Http.HttpContext! context) -> string!
+Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider.ValidateAdditionalData(Microsoft.AspNetCore.Http.HttpContext! context, string! additionalData) -> bool
+Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions
+static Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions.AddAntiforgery(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions.AddAntiforgery(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static readonly Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.DefaultCookiePrefix -> string!
diff --git a/src/Antiforgery/src/PublicAPI.Unshipped.txt b/src/Antiforgery/src/PublicAPI.Unshipped.txt
index 575a0a0b8605..7dc5c58110bf 100644
--- a/src/Antiforgery/src/PublicAPI.Unshipped.txt
+++ b/src/Antiforgery/src/PublicAPI.Unshipped.txt
@@ -1,33 +1 @@
#nullable enable
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.AntiforgeryOptions() -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.Cookie.get -> Microsoft.AspNetCore.Http.CookieBuilder!
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.Cookie.set -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.get -> string!
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.set -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.get -> string?
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.set -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.get -> bool
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.set -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.AntiforgeryTokenSet(string? requestToken, string? cookieToken, string! formFieldName, string? headerName) -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.CookieToken.get -> string?
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.FormFieldName.get -> string!
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.HeaderName.get -> string?
-Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet.RequestToken.get -> string?
-Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException
-Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException.AntiforgeryValidationException(string! message) -> void
-Microsoft.AspNetCore.Antiforgery.AntiforgeryValidationException.AntiforgeryValidationException(string! message, System.Exception? innerException) -> void
-Microsoft.AspNetCore.Antiforgery.IAntiforgery
-Microsoft.AspNetCore.Antiforgery.IAntiforgery.GetAndStoreTokens(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet!
-Microsoft.AspNetCore.Antiforgery.IAntiforgery.GetTokens(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet!
-Microsoft.AspNetCore.Antiforgery.IAntiforgery.IsRequestValidAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Antiforgery.IAntiforgery.SetCookieTokenAndHeader(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> void
-Microsoft.AspNetCore.Antiforgery.IAntiforgery.ValidateRequestAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider
-Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider.GetAdditionalData(Microsoft.AspNetCore.Http.HttpContext! context) -> string!
-Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider.ValidateAdditionalData(Microsoft.AspNetCore.Http.HttpContext! context, string! additionalData) -> bool
-Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions
-static Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions.AddAntiforgery(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static Microsoft.Extensions.DependencyInjection.AntiforgeryServiceCollectionExtensions.AddAntiforgery(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static readonly Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.DefaultCookiePrefix -> string!
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Shipped.txt b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..c6696c73a02c
--- /dev/null
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Shipped.txt
@@ -0,0 +1,47 @@
+#nullable enable
+Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults
+Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions
+Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.AzureADOptions() -> void
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.AccessDeniedModel
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.AccessDeniedModel.AccessDeniedModel() -> void
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.AccessDeniedModel.OnGet() -> void
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel.ErrorModel() -> void
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel.OnGet() -> void
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel.ShowRequestId.get -> bool
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.SignedOutModel
+Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.SignedOutModel.SignedOutModel() -> void
+Microsoft.AspNetCore.Authentication.AzureADAuthenticationBuilderExtensions
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.AllSchemes.get -> string[]
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.CallbackPath.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.CallbackPath.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.ClientId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.ClientId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.ClientSecret.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.ClientSecret.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.CookieSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.CookieSchemeName.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.Domain.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.Domain.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.Instance.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.Instance.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.JwtBearerSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.OpenIdConnectSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.OpenIdConnectSchemeName.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.SignedOutCallbackPath.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.SignedOutCallbackPath.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.TenantId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADOptions.TenantId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel.RequestId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.ErrorModel.RequestId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal.SignedOutModel.OnGet() -> Microsoft.AspNetCore.Mvc.IActionResult
+~const Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.AuthenticationScheme = "AzureAD" -> string
+~const Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.BearerAuthenticationScheme = "AzureADBearer" -> string
+~const Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.CookieScheme = "AzureADCookie" -> string
+~const Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.JwtBearerAuthenticationScheme = "AzureADJwtBearer" -> string
+~const Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.OpenIdScheme = "AzureADOpenID" -> string
+~static Microsoft.AspNetCore.Authentication.AzureADAuthenticationBuilderExtensions.AddAzureAD(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADAuthenticationBuilderExtensions.AddAzureAD(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string openIdConnectScheme, string cookieScheme, string displayName, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADAuthenticationBuilderExtensions.AddAzureADBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADAuthenticationBuilderExtensions.AddAzureADBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string jwtBearerScheme, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static readonly Microsoft.AspNetCore.Authentication.AzureAD.UI.AzureADDefaults.DisplayName -> string
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Unshipped.txt b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..7dc5c58110bf
--- /dev/null
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Shipped.txt b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..dc774f64eeb5
--- /dev/null
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Shipped.txt
@@ -0,0 +1,53 @@
+#nullable enable
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.AzureADB2COptions() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.AccessDeniedModel
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.AccessDeniedModel.AccessDeniedModel() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.AccessDeniedModel.OnGet() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel.ErrorModel() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel.OnGet() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel.ShowRequestId.get -> bool
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.SignedOutModel
+Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.SignedOutModel.SignedOutModel() -> void
+Microsoft.AspNetCore.Authentication.AzureADB2CAuthenticationBuilderExtensions
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.AllSchemes.get -> string[]
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.CallbackPath.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.CallbackPath.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ClientId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ClientId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ClientSecret.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ClientSecret.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.CookieSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.CookieSchemeName.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.DefaultPolicy.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.Domain.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.Domain.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.EditProfilePolicyId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.EditProfilePolicyId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.Instance.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.Instance.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.JwtBearerSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.OpenIdConnectSchemeName.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.OpenIdConnectSchemeName.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ResetPasswordPolicyId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.ResetPasswordPolicyId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.SignUpSignInPolicyId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.SignUpSignInPolicyId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.SignedOutCallbackPath.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2COptions.SignedOutCallbackPath.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel.RequestId.get -> string
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.ErrorModel.RequestId.set -> void
+~Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal.SignedOutModel.OnGet() -> Microsoft.AspNetCore.Mvc.IActionResult
+~const Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.AuthenticationScheme = "AzureADB2C" -> string
+~const Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.BearerAuthenticationScheme = "AzureADB2CBearer" -> string
+~const Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.CookieScheme = "AzureADB2CCookie" -> string
+~const Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.JwtBearerAuthenticationScheme = "AzureADB2CJwtBearer" -> string
+~const Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.OpenIdScheme = "AzureADB2COpenID" -> string
+~static Microsoft.AspNetCore.Authentication.AzureADB2CAuthenticationBuilderExtensions.AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADB2CAuthenticationBuilderExtensions.AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string openIdConnectScheme, string cookieScheme, string displayName, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADB2CAuthenticationBuilderExtensions.AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static Microsoft.AspNetCore.Authentication.AzureADB2CAuthenticationBuilderExtensions.AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string jwtBearerScheme, System.Action configureOptions) -> Microsoft.AspNetCore.Authentication.AuthenticationBuilder
+~static readonly Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.DisplayName -> string
+~static readonly Microsoft.AspNetCore.Authentication.AzureADB2C.UI.AzureADB2CDefaults.PolicyKey -> string
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Unshipped.txt b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..7dc5c58110bf
--- /dev/null
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Shipped.txt b/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Shipped.txt
index 7dc5c58110bf..8ae5bbc1c5f7 100644
--- a/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Shipped.txt
+++ b/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Shipped.txt
@@ -1 +1,4 @@
#nullable enable
+Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup
+Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup.AzureAppServicesHostingStartup() -> void
+~Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup.Configure(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) -> void
diff --git a/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Unshipped.txt b/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Unshipped.txt
index 8ae5bbc1c5f7..7dc5c58110bf 100644
--- a/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Unshipped.txt
+++ b/src/Azure/AzureAppServices.HostingStartup/src/PublicAPI.Unshipped.txt
@@ -1,4 +1 @@
#nullable enable
-Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup
-Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup.AzureAppServicesHostingStartup() -> void
-~Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup.Configure(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) -> void
diff --git a/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Shipped.txt b/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Shipped.txt
index 7dc5c58110bf..8a21c33de6f3 100644
--- a/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Shipped.txt
+++ b/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Shipped.txt
@@ -1 +1,3 @@
#nullable enable
+Microsoft.AspNetCore.Hosting.AppServicesWebHostBuilderExtensions
+~static Microsoft.AspNetCore.Hosting.AppServicesWebHostBuilderExtensions.UseAzureAppServices(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder
diff --git a/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Unshipped.txt b/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Unshipped.txt
index 8a21c33de6f3..7dc5c58110bf 100644
--- a/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Unshipped.txt
+++ b/src/Azure/AzureAppServicesIntegration/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
#nullable enable
-Microsoft.AspNetCore.Hosting.AppServicesWebHostBuilderExtensions
-~static Microsoft.AspNetCore.Hosting.AppServicesWebHostBuilderExtensions.UseAzureAppServices(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder
diff --git a/src/Components/Authorization/src/PublicAPI.Shipped.txt b/src/Components/Authorization/src/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..d9a2ae59c8af
--- /dev/null
+++ b/src/Components/Authorization/src/PublicAPI.Shipped.txt
@@ -0,0 +1,48 @@
+#nullable enable
+Microsoft.AspNetCore.Components.Authorization.AuthenticationState
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateChangedHandler
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.AuthenticationStateChanged -> Microsoft.AspNetCore.Components.Authorization.AuthenticationStateChangedHandler
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.AuthenticationStateProvider() -> void
+Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView
+Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.AuthorizeRouteView() -> void
+Microsoft.AspNetCore.Components.Authorization.AuthorizeView
+Microsoft.AspNetCore.Components.Authorization.AuthorizeView.AuthorizeView() -> void
+Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore
+Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.AuthorizeViewCore() -> void
+Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState
+Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.CascadingAuthenticationState() -> void
+Microsoft.AspNetCore.Components.Authorization.IHostEnvironmentAuthenticationStateProvider
+override Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.OnInitialized() -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthenticationState.AuthenticationState(System.Security.Claims.ClaimsPrincipal user) -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthenticationState.User.get -> System.Security.Claims.ClaimsPrincipal
+~Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.NotifyAuthenticationStateChanged(System.Threading.Tasks.Task task) -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.Authorizing.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.Authorizing.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.NotAuthorized.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.NotAuthorized.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.Resource.get -> object
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.Resource.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeView.Policy.get -> string
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeView.Policy.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeView.Roles.get -> string
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeView.Roles.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Authorized.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Authorized.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Authorizing.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Authorizing.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.ChildContent.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.ChildContent.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.NotAuthorized.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.NotAuthorized.set -> void
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Resource.get -> object
+~Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.Resource.set -> void
+~Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.ChildContent.get -> Microsoft.AspNetCore.Components.RenderFragment
+~Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.ChildContent.set -> void
+~Microsoft.AspNetCore.Components.Authorization.IHostEnvironmentAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task authenticationStateTask) -> void
+~abstract Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task
+~abstract Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.GetAuthorizeData() -> Microsoft.AspNetCore.Authorization.IAuthorizeData[]
+~override Microsoft.AspNetCore.Components.Authorization.AuthorizeView.GetAuthorizeData() -> Microsoft.AspNetCore.Authorization.IAuthorizeData[]
+~override Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) -> void
+~override Microsoft.AspNetCore.Components.Authorization.AuthorizeViewCore.OnParametersSetAsync() -> System.Threading.Tasks.Task
+~override Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) -> void
diff --git a/src/Components/Authorization/src/PublicAPI.Unshipped.txt b/src/Components/Authorization/src/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..7dc5c58110bf
--- /dev/null
+++ b/src/Components/Authorization/src/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 7bd73bc5a640..c44f5f6e9927 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -39,8 +39,8 @@
-
-
+
+
@@ -51,7 +51,7 @@
-
+
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
index 2a1dfc4323ea..bc983db2fa0d 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
@@ -4,8 +4,8 @@
$CommonMetadataElements$
-
-
+
+
diff --git a/src/Components/Components/src/PublicAPI.Shipped.txt b/src/Components/Components/src/PublicAPI.Shipped.txt
index ab058de62d44..212a110e0e76 100644
--- a/src/Components/Components/src/PublicAPI.Shipped.txt
+++ b/src/Components/Components/src/PublicAPI.Shipped.txt
@@ -1 +1,429 @@
#nullable enable
+Microsoft.AspNetCore.Components.BindConverter
+Microsoft.AspNetCore.Components.BindElementAttribute
+Microsoft.AspNetCore.Components.BindElementAttribute.BindElementAttribute(string! element, string? suffix, string! valueAttribute, string! changeAttribute) -> void
+Microsoft.AspNetCore.Components.BindElementAttribute.ChangeAttribute.get -> string!
+Microsoft.AspNetCore.Components.BindElementAttribute.Element.get -> string!
+Microsoft.AspNetCore.Components.BindElementAttribute.Suffix.get -> string?
+Microsoft.AspNetCore.Components.BindElementAttribute.ValueAttribute.get -> string!
+Microsoft.AspNetCore.Components.CascadingParameterAttribute
+Microsoft.AspNetCore.Components.CascadingParameterAttribute.CascadingParameterAttribute() -> void
+Microsoft.AspNetCore.Components.CascadingParameterAttribute.Name.get -> string?
+Microsoft.AspNetCore.Components.CascadingParameterAttribute.Name.set -> void
+Microsoft.AspNetCore.Components.CascadingValue
+Microsoft.AspNetCore.Components.CascadingValue.Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) -> void
+Microsoft.AspNetCore.Components.CascadingValue.CascadingValue() -> void
+Microsoft.AspNetCore.Components.CascadingValue.ChildContent.get -> Microsoft.AspNetCore.Components.RenderFragment!
+Microsoft.AspNetCore.Components.CascadingValue.ChildContent.set -> void
+Microsoft.AspNetCore.Components.CascadingValue.IsFixed.get -> bool
+Microsoft.AspNetCore.Components.CascadingValue.IsFixed.set -> void
+Microsoft.AspNetCore.Components.CascadingValue.Name.get -> string?
+Microsoft.AspNetCore.Components.CascadingValue.Name.set -> void
+Microsoft.AspNetCore.Components.CascadingValue.SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.CascadingValue.Value.get -> TValue
+Microsoft.AspNetCore.Components.CascadingValue.Value.set -> void
+Microsoft.AspNetCore.Components.ChangeEventArgs
+Microsoft.AspNetCore.Components.ChangeEventArgs.ChangeEventArgs() -> void
+Microsoft.AspNetCore.Components.ChangeEventArgs.Value.get -> object?
+Microsoft.AspNetCore.Components.ChangeEventArgs.Value.set -> void
+Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers
+Microsoft.AspNetCore.Components.ComponentBase
+Microsoft.AspNetCore.Components.ComponentBase.ComponentBase() -> void
+Microsoft.AspNetCore.Components.ComponentBase.InvokeAsync(System.Action! workItem) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.ComponentBase.InvokeAsync(System.Func! workItem) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.ComponentBase.StateHasChanged() -> void
+Microsoft.AspNetCore.Components.Dispatcher
+Microsoft.AspNetCore.Components.Dispatcher.AssertAccess() -> void
+Microsoft.AspNetCore.Components.Dispatcher.Dispatcher() -> void
+Microsoft.AspNetCore.Components.Dispatcher.OnUnhandledException(System.UnhandledExceptionEventArgs! e) -> void
+Microsoft.AspNetCore.Components.ElementReference
+Microsoft.AspNetCore.Components.ElementReference.Context.get -> Microsoft.AspNetCore.Components.ElementReferenceContext?
+Microsoft.AspNetCore.Components.ElementReference.ElementReference(string! id) -> void
+Microsoft.AspNetCore.Components.ElementReference.ElementReference(string! id, Microsoft.AspNetCore.Components.ElementReferenceContext? context) -> void
+Microsoft.AspNetCore.Components.ElementReference.Id.get -> string!
+Microsoft.AspNetCore.Components.ElementReferenceContext
+Microsoft.AspNetCore.Components.ElementReferenceContext.ElementReferenceContext() -> void
+Microsoft.AspNetCore.Components.EventCallback
+Microsoft.AspNetCore.Components.EventCallback.EventCallback(Microsoft.AspNetCore.Components.IHandleEvent? receiver, System.MulticastDelegate? delegate) -> void
+Microsoft.AspNetCore.Components.EventCallback.HasDelegate.get -> bool
+Microsoft.AspNetCore.Components.EventCallback.InvokeAsync() -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.EventCallback.InvokeAsync(object? arg) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.EventCallback
+Microsoft.AspNetCore.Components.EventCallback.EventCallback(Microsoft.AspNetCore.Components.IHandleEvent? receiver, System.MulticastDelegate? delegate) -> void
+Microsoft.AspNetCore.Components.EventCallback.HasDelegate.get -> bool
+Microsoft.AspNetCore.Components.EventCallback.InvokeAsync() -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.EventCallback.InvokeAsync(TValue? arg) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.EventCallbackFactory
+Microsoft.AspNetCore.Components.EventCallbackFactory.Create(object! receiver, Microsoft.AspNetCore.Components.EventCallback callback) -> Microsoft.AspNetCore.Components.EventCallback
+Microsoft.AspNetCore.Components.EventCallbackFactory.Create(object! receiver, System.Action! callback) -> Microsoft.AspNetCore.Components.EventCallback
+Microsoft.AspNetCore.Components.EventCallbackFactory.Create(object! receiver, System.Action