Use even more Arcade and other csproj cleanups

Directory.Build.props

@@ -20,9 +20,7 @@
   </PropertyGroup>
 
   <Import Project="eng\FlakyTests.BeforeArcade.props" />
-  <Import Project="eng\Workarounds.BeforeArcade.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-  <Import Project="eng\Workarounds.AfterArcade.props" />
   <Import Project="eng\FlakyTests.AfterArcade.props" />
 
   <PropertyGroup>
@@ -76,6 +74,5 @@
   <Import Project="eng\PatchConfig.props" />
   <Import Project="eng\ProjectReferences.props" />
   <Import Project="eng\targets\Csharp.Refs.props" Condition="'$(IsReferenceAssemblyProject)' == 'true'" />
-
   <Import Project="eng\targets\Npm.Common.props" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
 </Project>

Directory.Build.targets

@@ -3,8 +3,6 @@
   <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
     <PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId>
     <Description Condition=" '$(Description)' == ''">$(PackageId)</Description>
-    <IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsUnitTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsReferenceAssemblyProject)' == 'true' ) ">false</IsPackable>
-    <IsPackable Condition="'$(IsPackable)' == '' ">true</IsPackable>
   </PropertyGroup>
 
   <Import Project="eng\Baseline.Designer.props" />
@@ -44,6 +42,5 @@
   <Import Project="eng\targets\ReferenceAssembly.targets" Condition=" '$(HasReferenceAssembly)' == 'true' " />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\Workarounds.AfterArcade.targets" />
-
   <Import Project="eng\targets\Npm.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
 </Project>

azure-pipelines.yml

@@ -108,7 +108,7 @@ jobs:
       - script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig)
         displayName: Run Flaky Tests
         continueOnError: true
-      - powershell: eng\common\msbuild.ps1 eng/repo.targets /t:TagCiBuilds '/p:IsFinalBuild=$(IsFinalBuild)' '/p:CI=true'
+      - powershell: eng\common\msbuild.ps1 eng/repo.targets /t:TagCiBuilds '/p:DotNetFinalVersionKind=$(DotNetFinalVersionKind)' '/p:CI=true'
         displayName: Set CI Tags
         condition: eq(variables['_BuildConfig'], 'Release')
       - powershell: eng\scripts\KillProcesses.ps1

docs/DailyBuilds.md

@@ -13,7 +13,8 @@ If you want to download the latest daily build and use it in a project, then you
   <configuration>
       <packageSources>
           <clear />
-          <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+          <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+          <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
           <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
       </packageSources>
   </configuration>
@@ -23,21 +24,3 @@ If you want to download the latest daily build and use it in a project, then you
 
 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/).
-
-## NuGet packages
-
-Daily builds of ackages can be found on <https://dotnet.myget.org/gallery/dotnet-core>. This feed may include
-packages that will not be supported in a officially released build.
-
-Commonly referenced packages:
-
-[logging-myget]:  https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.Extensions.Logging
-[logging-myget-badge]: https://img.shields.io/dotnet.myget/dotnet-core/vpre/Microsoft.Extensions.Logging.svg?style=flat-square&label=myget
-
-[di-myget]:  https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.Extensions.DependencyInjection
-[di-myget-badge]: https://img.shields.io/dotnet.myget/dotnet-core/vpre/Microsoft.Extensions.DependencyInjection.svg?style=flat-square&label=myget
-
-Package                                    | MyGet
-:------------------------------------------|:---------------------------------------------------------
-Microsoft.Extensions.Logging               | [![][logging-myget-badge]][logging-myget]
-Microsoft.Extensions.DependencyInjection   | [![][di-myget-badge]][di-myget]

docs/PreparingPatchUpdates.md

@@ -3,7 +3,7 @@ Preparing new servicing updates
 
 In order to prepare this repo to build a new servicing update, the following changes need to be made.
 
-* Increment the patch version in the [version.props](/version.props) file in the repository root.
+* Increment the patch version in the [eng/Versions.props](/eng/Versions.props) file in the repository root.
 
     ```diff
     -  <PatchVersion>7</PatchVersion>

eng/Versions.props

@@ -5,10 +5,32 @@
 
 -->
 <Project>
-  <Import Project="..\version.props" />
+  <PropertyGroup Label="Version settings">
+    <MajorVersion>3</MajorVersion>
+    <MinorVersion>0</MinorVersion>
+    <PatchVersion>0</PatchVersion>
+    <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
+    <PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
+    <AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
+    <!--
+      We do not support changing reference assemblies in a patch. This ignores
+      the patch version number to ensure assembly version of ref assemblies stays constant
+      throughout major.minor.
+    -->
+    <AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
+    <ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
+    <!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
+    <IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
+    <!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
+    <PreviousExtensionsReleaseVersion Condition=" '$(PatchVersion)' != '0' ">$(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1))</PreviousExtensionsReleaseVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Arcade settings">
     <!-- Opt-in to using the version of the Roslyn compiler bundled with Arcade. -->
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
+      <!-- Disable Arcade's Xliff tools -->
+    <UsingToolXliff>false</UsingToolXliff>
+    <!-- Using .NET framework assemblies from a package. -->
+    <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
   </PropertyGroup>
   <!--
 

eng/repo.targets

@@ -3,8 +3,8 @@
   <Import Project="Build.props" />
 
   <Target Name="TagCiBuilds" Condition=" '$(CI)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' ">
-    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsFinalBuild)' != 'true' " />
-    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsFinalBuild)' == 'true' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(DotNetFinalVersionKind)' == '' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(DotNetFinalVersionKind)' != '' " />
   </Target>
 
   <Target Name="GenerateProjectList">

src/Analyzers/Async/test/Microsoft.DotNet.Analyzers.Async.Tests.csproj

@@ -3,7 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <TestGroupName>AsyncAnalyzers</TestGroupName>
+    <!-- Analyzers tests can't find netfx ref assemblies from a package -->
+    <UsingToolNetFrameworkReferenceAssemblies Condition="'$(OS)' == 'Windows_NT'">false</UsingToolNetFrameworkReferenceAssemblies>
   </PropertyGroup>
 
   <ItemGroup>

src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj

@@ -9,6 +9,7 @@ Microsoft.Extensions.Caching.Memory.IMemoryCache</Description>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;memorycache;distributedcache</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj

@@ -6,6 +6,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;memorycache</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj

@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
-    <TestGroupName>Caching.Memory</TestGroupName>
   </PropertyGroup>
 
   <ItemGroup>

src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj

@@ -6,6 +6,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;distributedcache;sqlserver</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj

@@ -6,6 +6,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;distributedcache;redis</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj

@@ -9,6 +9,7 @@ Microsoft.Extensions.Configuration.IConfigurationBuilder
 Microsoft.Extensions.Configuration.IConfigurationProvider
 Microsoft.Extensions.Configuration.IConfigurationRoot
 Microsoft.Extensions.Configuration.IConfigurationSection</Description>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.AzureKeyVault/src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj

@@ -4,6 +4,7 @@
     <Description>Azure KeyVault configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);azure;keyvault</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj

@@ -4,6 +4,7 @@
     <Description>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);commandline</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj

@@ -4,6 +4,7 @@
     <Description>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);envvar;environmentvariable</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj

@@ -4,6 +4,7 @@
     <Description>INI configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);ini</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj

@@ -4,6 +4,7 @@
     <Description>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <PackageTags>$(PackageTags);json</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>

src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.NewtonsoftJson/src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj

@@ -4,6 +4,7 @@
     <Description>Newtonsoft JSON configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);json</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj

@@ -4,6 +4,7 @@
     <Description>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);secrets;usersecrets</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj

@@ -4,6 +4,7 @@
     <Description>XML configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);xml</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/DependencyInjection/DI.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj

@@ -8,6 +8,7 @@ Microsoft.Extensions.DependencyInjection.IServiceCollection</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>dependencyinjection;di</PackageTags>
     <DefineConstants>$(DefineConstants);ActivatorUtilities_In_DependencyInjection</DefineConstants>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/DependencyInjection/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj

@@ -9,6 +9,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <!-- This is actually a library for test projects, not a test project. -->
     <IsUnitTestProject>false</IsUnitTestProject>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <HasReferenceAssembly>false</HasReferenceAssembly>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>

src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj

@@ -5,6 +5,7 @@
     <TargetFrameworks>netcoreapp3.0;net461;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>dependencyinjection;di</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
 
     <ILEmitBackend Condition="$(TargetFramework) != 'netstandard2.0'">True</ILEmitBackend>

src/DiagnosticAdapter/src/Microsoft.Extensions.DiagnosticAdapter.csproj

@@ -6,6 +6,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>diagnosticadapter;diagnosticlistener;diagnostics</PackageTags>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj

@@ -8,6 +8,7 @@ Microsoft.Extensions.FileProviders.IDirectoryContents
 Microsoft.Extensions.FileProviders.IFileInfo
 Microsoft.Extensions.FileProviders.IFileProvider</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
 

src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj

@@ -4,6 +4,7 @@
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
     <Description>Composite file and directory providers for Microsoft.Extensions.FileProviders.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>