Merge branch 'master' into merge/release/3.0-preview3-to-master

Author: dougbu

.azure/pipelines/ci.yml

@@ -162,9 +162,11 @@ jobs:
           --arch x64 \
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
           --no-restore \
+          --no-build-deps \
           /t:BuildSharedFx  \
           /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=deb
+          /p:LinuxInstallerType=deb \
+          /bl:artifacts/logs/build.deb.binlog
       displayName: Build Debian installers
     - script: |
         rm -rf .dotnet/
@@ -173,9 +175,12 @@ jobs:
           --ci --pack --all --no-build-nodejs --no-build-java \
           --arch x64 \
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
+          --no-restore \
+          --no-build-deps \
           /t:BuildSharedFx  \
           /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=rpm
+          /p:LinuxInstallerType=rpm \
+          /bl:artifacts/logs/build.rpm.binlog
       displayName: Build RPM installers
     afterBuild:
     # Remove packages that are not rid-specific.

.gitignore

@@ -17,6 +17,7 @@ StyleCop.Cache
 node_modules/
 *.snk
 .nuget
+.packages/
 .r
 .w
 .deps

Directory.Build.props

@@ -6,7 +6,6 @@
 
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corporation.</Company>
-    <RpmPackageVendor>.NET Foundation</RpmPackageVendor>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
 
@@ -102,6 +101,10 @@
 
     <!-- Fixes a common error in targets implementing a NoBuild mode. -->
     <BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
+
+    <IsReferenceAssemblyProject>false</IsReferenceAssemblyProject>
+    <IsReferenceAssemblyProject Condition="$(MSBuildProjectDirectory.EndsWith('ref'))">true</IsReferenceAssemblyProject>
+    <OutDirName Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MSBuildProjectName)-ref</OutDirName>
   </PropertyGroup>
 
   <Import Project="eng\Versions.props" />
@@ -157,6 +160,8 @@
     <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
     <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
     <IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
+    <IsSpecificationTestProject Condition="$(MSBuildProjectName.EndsWith('.Specification.Tests'))">true</IsSpecificationTestProject>
+
   </PropertyGroup>
 
   <Import Project="build\tasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />

Directory.Build.targets

@@ -22,7 +22,7 @@
 
   <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
     <PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId>
-    <IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' ) ">false</IsPackable>
+    <IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsReferenceAssemblyProject)' == 'true' ) ">false</IsPackable>
   </PropertyGroup>
 
   <Import Project="eng\Baseline.Designer.props" />
@@ -55,11 +55,14 @@
 
   <PropertyGroup>
     <!-- Implementation projects are the projects which produce nuget packages or shipping assemblies. -->
-    <IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsAnalyzersProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsImplementationProject>
+    <IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsAnalyzersProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' AND '$(IsReferenceAssemblyProject)' != 'true' ">true</IsImplementationProject>
 
     <!-- This determines whether a project is available as a <Reference> to other projects in this repo. -->
     <IsProjectReferenceProvider Condition=" '$(IsProjectReferenceProvider)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(PackAsTool)' != 'true' ">true</IsProjectReferenceProvider>
 
+    <HasReferenceAssembly Condition="'$(HasReferenceAssembly)' == '' AND '$(IsProjectReferenceProvider)' == 'true'">true</HasReferenceAssembly>
+    <HasReferenceAssembly Condition="'$(HasReferenceAssembly)' == ''">false</HasReferenceAssembly>
+
     <!-- Suppress KoreBuild warnings about the mismatch of repo version and local project version. The versioning in this mega repo is sufficiently complicated that KoreBuild's validation isn't helpful. -->
     <VerifyVersion>false</VerifyVersion>
 
@@ -93,91 +96,6 @@
   <Import Project="eng\targets\FSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
   <Import Project="eng\targets\Wix.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
   <Import Project="eng\targets\Npm.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
+  <Import Project="eng\targets\ReferenceAssembly.targets" Condition=" '$(HasReferenceAssembly)' == 'true' " />
 
-  <!-- Prepares the test projects for helix by including xunit and publishing -->
-  <Target Name="PrepareHelixPayload" Returns="@(HelixDirectory)">
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_PrepareHelixPayloadInner"
-             Properties="TargetFramework=%(_TargetFrameworks.Identity);IsWindowsHelixQueue=$(HelixTargetQueue.Contains('Windows'))">
-      <Output TaskParameter="TargetOutputs" ItemName="HelixDirectory" />
-    </MSBuild>
-  </Target>
-
-  <Target Name="_PrepareHelixPayloadInner"
-    DependsOnTargets="Publish"
-    Condition="'$(BuildHelixPayload)' == 'true'"
-    Returns="@(HelixDirectory)">
-
-    <ItemGroup>
-      <HelixDirectory Include="$(MSBuildProjectFullPath)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Build the actual helix work items to send to helix queues -->
-  <Target Name="CreateHelixPayload" Returns="@(HelixPayload)">
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_CreateHelixPayloadInner"
-             Properties="TargetFramework=%(_TargetFrameworks.Identity);IsWindowsHelixQueue=$(HelixTargetQueue.Contains('Windows'))">
-      <Output TaskParameter="TargetOutputs" ItemName="HelixPayload" />
-    </MSBuild>
-  </Target>
-
-  <Target Name="CollectXunitConsoleRunner" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PropertyGroup>
-      <XunitConsoleRunnerDir>$([System.IO.Path]::GetDirectoryName($(XunitConsole472Path)))</XunitConsoleRunnerDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <XunitConsoleRunnerFiles Include="$(XunitConsoleRunnerDir)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(XunitConsoleRunnerFiles)" DestinationFolder="$(PublishDir)" />
-  </Target>
-
-  <Target Name="_CreateHelixPayloadInner"
-    DependsOnTargets="CollectXunitConsoleRunner"
-    Condition="($(IsWindowsHelixQueue) OR '$(TargetFrameworkIdentifier)' != '.NETFramework')"
-    Returns="@(HelixPayload)">
-
-    <ConvertToAbsolutePath Paths="$(PublishDir)">
-      <Output TaskParameter="AbsolutePaths" PropertyName="PublishAbsoluteDir" />
-    </ConvertToAbsolutePath>
-
-    <!-- Windows NetCore -->
-    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' AND $(IsWindowsHelixQueue)" >
-        <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.cmd" />
-    </ItemGroup>
-
-    <!-- Windows NetFramework -->
-    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND $(IsWindowsHelixQueue)" >
-        <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\xunit\runtests.cmd" />
-    </ItemGroup>
-
-    <!-- NonWindows -->
-    <ItemGroup Condition="!$(IsWindowsHelixQueue)"  >
-        <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.sh" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(PublishAbsoluteDir)" />
-
-    <ItemGroup>
-      <HelixPayload Include="$(PublishAbsoluteDir)">
-        <TestAssembly>$(TargetFileName)</TestAssembly>
-        <TestName>$(MSBuildProjectName)-$(TargetFramework)</TestName>
-        <Command Condition="$(IsWindowsHelixQueue)">runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion)</Command>
-        <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion)</Command>
-        <TestTimeout>00:30:00</TestTimeout>
-      </HelixPayload>
-    </ItemGroup>
-  </Target>
 </Project>

NuGet.config

@@ -9,5 +9,6 @@
     -->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

build.ps1

@@ -306,6 +306,7 @@ $MSBuildArguments += "/p:TargetOsName=win"
 Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
 
 try {
+    $env:KOREBUILD_KEEPGLOBALJSON = 1
     Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $PSScriptRoot -ConfigFile $ConfigFile -CI:$CI
     if ($ForceCoreMsbuild) {
         $global:KoreBuildSettings.MSBuildType = 'core'
@@ -315,4 +316,5 @@ try {
 finally {
     Remove-Module 'KoreBuild' -ErrorAction Ignore
     Remove-Item env:DOTNET_HOME
+    Remove-Item env:KOREBUILD_KEEPGLOBALJSON
 }

build/SharedFx.targets

@@ -12,8 +12,8 @@
     <FxProjectToBuild Include="$(UnitTestFxProject)" />
     <FxProjectToBuild Condition=" '$(BuildRuntimeArchive)' != 'false' " Include="$(RepositoryRoot)src\Installers\Archive\*.*proj" />
 
-    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'deb' " Include="$(RepositoryRoot)src\Installers\Debian\*.*proj" />
-    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'rpm' " Include="$(RepositoryRoot)src\Installers\Rpm\*.*proj" />
+    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'deb' " Include="$(RepositoryRoot)src\Installers\Debian\**\*.*proj" />
+    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'rpm' " Include="$(RepositoryRoot)src\Installers\Rpm\**\*.*proj" />
 
     <FxProjectToBuild Condition=" '$(BuildSiteExtensions)' == 'true' " Include="$(RepositoryRoot)src\SiteExtensions\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" />
     <FxProjectToBuild Condition=" '$(BuildSiteExtensions)' == 'true' " Include="$(RepositoryRoot)src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" />

build/repo.targets

@@ -67,27 +67,31 @@
     <ItemGroup>
       <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'true')->Distinct())" />
       <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'false')->Distinct())" />
+      <_ProjectReferenceProviderWithRefAssembly Include="@(_ProjectReferenceProvider->HasMetadata('ReferenceAssemblyProjectFileRelativePath'))" />
+      <_ProjectReferenceProvider Remove="@(_ProjectReferenceProviderWithRefAssembly)" />
     </ItemGroup>
 
     <PropertyGroup>
       <ProjectListFile>$(MSBuildThisFileDirectory)..\eng\ProjectReferences.props</ProjectListFile>
-      <ProjectListContent>
-      <![CDATA[
-<!--
+      <ProjectListContent><![CDATA[<!--
   This file is automatically generated. Run `./eng/scripts/GenerateProjectList.ps1` to update.
 
   This file contains a map of assembly names to the projects that build them.
 -->
 <Project>
   <ItemGroup>
-    @(_ProjectReferenceProvider->'<ProjectReferenceProvider Include="%(Identity)" ProjectPath="%24(RepositoryRoot)%(ProjectFileRelativePath)" />', '%0A    ')
+    @(_ProjectReferenceProvider->'<ProjectReferenceProvider Include="%(Identity)" ProjectPath="%24(RepositoryRoot)%(ProjectFileRelativePath)"  />', '%0A    ')
+    @(_ProjectReferenceProviderWithRefAssembly->'<ProjectReferenceProvider Include="%(Identity)" ProjectPath="%24(RepositoryRoot)%(ProjectFileRelativePath)" RefProjectPath="%24(RepositoryRoot)%(ReferenceAssemblyProjectFileRelativePath)" />', '%0A    ')
   </ItemGroup>
 </Project>
-      ]]>
-      </ProjectListContent>
+]]></ProjectListContent>
     </PropertyGroup>
 
-    <WriteLinesToFile File="$(ProjectListFile)" Lines="$(ProjectListContent)" Overwrite="true" />
+    <!-- Workaround https://github.com/Microsoft/msbuild/issues/1024 -->
+    <WriteLinesToFile Condition="'$(OS)' == 'Windows_NT'"
+                      File="$(ProjectListFile)" Lines="$([MSBuild]::Escape($(ProjectListContent)))" Overwrite="true" />
+    <Exec Condition="'$(OS)' != 'Windows_NT'"
+          Command="echo '$(ProjectListContent.Replace('\t','\\t'))' > $(ProjectListFile)" />
 
     <PropertyGroup>
       <SharedFxDepList>$(MSBuildThisFileDirectory)..\eng\SharedFramework.Local.props</SharedFxDepList>
@@ -116,6 +120,14 @@
     <WriteLinesToFile File="$(SharedFxDepList)" Lines="$(SharedFxDepListContent)" Overwrite="true" />
   </Target>
 
+  <Target Name="GenerateReferenceSources">
+      <MSBuild
+          Projects="@(ProjectToBuild)"
+          Targets="GenerateReferenceSource"
+          SkipNonexistentTargets="true"
+          SkipNonexistentProjects="true" />
+  </Target>
+
   <!-- This is temporary until we can use FrameworkReference to build our own packages. -->
   <Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec">
     <ItemGroup>
@@ -139,30 +151,9 @@
              Properties="$(BuildProperties);__DummyTarget=GenerateBuildAssetManifest" />
   </Target>
 
-  <!-- will move into korebuild -->
-  <Target Name="HelixPublish" DependsOnTargets="Restore">
-    <ItemGroup>
-      <CsProjects Include="@(ProjectToBuild)" Condition="'%(Extension)' == '.csproj'" />
-    </ItemGroup>
-    <MSBuild Projects="@(CsProjects)"
-              Targets="PrepareHelixPayload"
-              BuildInParallel="false">
-      <Output TaskParameter="TargetOutputs" ItemName="HelixDirectory" />
-    </MSBuild>
-
-    <ItemGroup>
-      <HelixTestProject Include="@(HelixDirectory)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="Helix" DependsOnTargets="HelixPublish">
-    <PropertyGroup>
-      <HelixTestProjects>@(HelixTestProject)</HelixTestProjects>
-    </PropertyGroup>
+  <Target Name="Helix" DependsOnTargets="Restore">
     <MSBuild Projects="$(MSBuildThisFileDirectory)..\eng\helix\helix.proj"
              Targets="Test"
-             Properties="ProjectsToTest=$(HelixTestProjects)"
-             ContinueOnError="ErrorAndStop"
-             BuildInParallel="false" />
+             ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>

build/tasks/RepoTasks.csproj

@@ -14,6 +14,7 @@
     <PackageReference Remove="Internal.AspNetCore.Sdk" />
     <PackageReference Include="NuGet.Build.Tasks" Version="4.9.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="Yarn.MSBuild" Version="1.13.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win'">

docs/ReferenceAssemblies.md

@@ -0,0 +1,25 @@
+Reference assemblies
+========================
+
+Most projects in this repo have a `ref` directory next to their `src` that contains the project and source code for a reference assembly.
+Reference assemblies contain the public API surface of libraries and are used for ASP.NET Core targeting pack generation.
+
+### When changing public API
+
+Run `dotnet msbuild /t:GenerateReferenceSource` in that project's `src` directory
+
+### When adding a new project
+
+Run `.\eng\scripts\GenerateProjectList.ps1` from the repository root and `dotnet msbuild /t:GenerateReferenceSource` in that project's `src` directory
+
+### To set project properties in a reference assembly project
+
+`ref.csproj` is automaticaly generated and shouldn't be edited. To set project properties on a reference assembly project place a `Directory.Build.props` next to it and add the properties there.
+
+### My project doesn't need a reference assembly
+
+Set `<HasReferenceAssembly>false</HasReferenceAssembly>` in the implementation (`src`) project and re-run `.\eng\scripts\GenerateProjectList.ps1`.
+
+### Regenerate reference assemblies for all projects
+
+Run `.\eng\scripts\GenerateReferenceAssemblies.ps1` from repository root.

eng/Dependencies.props

@@ -47,6 +47,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <LatestPackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftCodeAnalysisRazorPackageVersion)" />
     <LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
     <LatestPackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />

eng/GenAPI.exclusions.txt

@@ -0,0 +1,5 @@
+# Manually implemented - https://github.com/dotnet/arcade/pull/2033
+T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame
+# Manually implemented - https://github.com/dotnet/arcade/issues/2066
+T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel
+T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel

eng/LicenseHeader.txt

@@ -0,0 +1,3 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+