Use Arcade conventions for using DebugType and eng/Versions.props

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>

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/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/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

@@ -4,7 +4,6 @@
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
     <Description>File provider for files in embedded resources for Microsoft.Extensions.FileProviders.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
@@ -25,7 +24,6 @@
 
   <Target Name="PopulateNuspec" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup;DebugSymbolsProjectOutputGroup;">
     <PropertyGroup>
-      <PackageTags>$(PackageTags.Replace(';',' '))</PackageTags>
       <_OutputBinary>@(BuiltProjectOutputGroupOutput)</_OutputBinary>
       <_OutputSymbol>@(DebugSymbolsProjectOutputGroupOutput)</_OutputSymbol>
       <_OutputDocumentation>@(DocumentationProjectOutputGroupOutput)</_OutputDocumentation>
@@ -38,7 +36,7 @@
       <NuspecProperty Include="OutputDocumentation=$(_OutputDocumentation)"/>
       <!-- Include the assembly and symbols from the tasks project -->
       <NuspecProperty Include="TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll"/>
-      <NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb"/>
+      <NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb" Condition="'$(DebugType)'!='embedded'"/>
     </ItemGroup>
   </Target>
 </Project>