From 4a73b5e6d298c69fd038b406fbd1413501ffcb4f Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 5 Dec 2018 12:26:51 -0800
Subject: [PATCH] Progress

---
 Directory.Build.props                         |  1 +
 eng/Dependencies.props                        |  4 +--
 eng/Versions.props                            | 35 ++++---------------
 .../Directory.Build.props                     |  2 ++
 ...ndencyInjection.Specification.Tests.csproj |  2 +-
 ...sions.FileProviders.Composite.Tests.csproj |  2 +-
 6 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c11436f08d7..13eaabeb830 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -68,6 +68,7 @@
     <IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
     <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
     <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('samples'))">true</IsSampleProject>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index b6ab17d74b8..940e97a2f7d 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -27,9 +27,6 @@
     <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
   </PropertyGroup>
 
-  <!-- This may import a generated file which may override the variables above. -->
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-
   <ItemGroup Label=".NET Core dependencies">
     <LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
     <LatestPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
@@ -61,6 +58,7 @@
   <PropertyGroup Label="External dependency versions">
     <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
   </PropertyGroup>
 
   <ItemGroup Label="External dependencies">
diff --git a/eng/Versions.props b/eng/Versions.props
index 8dc430aaafa..d75a1e44c4f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,42 +4,19 @@
     <MajorVersion>3</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
+    <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <OfficialBuildId Condition="'$(OfficialBuildId)' == ''">$(BUILD_BUILDNUMBER)</OfficialBuildId>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OfficialBuildId)' != '' ">
-    <!-- This implements core versioning. Spec: https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md -->
-    <_BuildNumber>$(OfficialBuildId)</_BuildNumber>
-    <!-- _BuildNumber from CI is assumed to have format "yyyyMMdd.r". -->
-    <_BuildNumberYY>$(_BuildNumber.Substring(2, 2))</_BuildNumberYY>
-    <_BuildNumberMM>$(_BuildNumber.Substring(4, 2))</_BuildNumberMM>
-    <_BuildNumberDD>$(_BuildNumber.Substring(6, 2))</_BuildNumberDD>
-    <_BuildNumberR>$(_BuildNumber.Substring(9))</_BuildNumberR>
-    <!-- yy * 1000 + mm * 50 + dd -->
-    <_BuildNumberShortDate>$([MSBuild]::Add($([MSBuild]::Add($([MSBuild]::Multiply($(_BuildNumberYY), 1000)), $([MSBuild]::Multiply($(_BuildNumberMM), 50)))), $(_BuildNumberDD)))</_BuildNumberShortDate>
-    <VersionSuffixBuildOfTheDay>$([System.Convert]::ToInt32($(_BuildNumberR)))</VersionSuffixBuildOfTheDay>
-    <_BuildNumberSuffix>$(_BuildNumberShortDate).$(VersionSuffixBuildOfTheDay)</_BuildNumberSuffix>
+    <VersionSuffix>$(PreReleaseVersionLabel)</VersionSuffix>
+    <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
   </PropertyGroup>
+
   <PropertyGroup>
-    <_BuildNumberSuffix Condition=" '$(_BuildNumberSuffix)' == '' ">0</_BuildNumberSuffix>
-    <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
-    <VersionSuffix>$(PreReleaseVersionLabel).$(_BuildNumberSuffix)</VersionSuffix>
     <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>
-    <!-- Run the build with /p:IsFinalBuild=true to produce the product with 'final' branding and versioning -->
-    <IsFinalBuild Condition=" '$(IsFinalBuild)' == '' ">false</IsFinalBuild>
-    <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
-    <IncludePreReleaseLabelInPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND ('$(PreReleaseVersionLabel)' == 'servicing' OR '$(PreReleaseVersionLabel)' == 'rtm')">false</IncludePreReleaseLabelInPackageVersion>
     <!-- The version in files -->
-    <PackageVersion>$(VersionPrefix)</PackageVersion>
-    <PackageVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
     <ExperimentalPackageVersion>$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
     <ExperimentalPackageVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(VersionPrefix)-$(VersionSuffix)</ExperimentalPackageVersion>
-    <VersionMetadata Condition=" '$(DotNetProductBuildId)' != '' ">pb-$(DotNetProductBuildId)</VersionMetadata>
-    <VersionSuffix Condition=" '$(VersionMetadata)' != '' ">$(VersionSuffix)+$(VersionMetadata)</VersionSuffix>
-    <ExperimentalVersionSuffix>$(VersionSuffix)</ExperimentalVersionSuffix>
-    <InformationalVersion>$(VersionPrefix)-$(VersionSuffix)</InformationalVersion>
+
+    <ExperimentalVersionSuffix>$(PreReleaseVersionLabel)</ExperimentalVersionSuffix>
     <!-- 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>
diff --git a/src/DependencyInjection/DI.Specification.Tests/Directory.Build.props b/src/DependencyInjection/DI.Specification.Tests/Directory.Build.props
index f25c1d90ce8..6acc2b26b36 100644
--- a/src/DependencyInjection/DI.Specification.Tests/Directory.Build.props
+++ b/src/DependencyInjection/DI.Specification.Tests/Directory.Build.props
@@ -3,5 +3,7 @@
 
   <PropertyGroup>
     <IsProductComponent>true</IsProductComponent>
+    <IsUnitTestProject>false</IsUnitTestProject>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 </Project>
diff --git a/src/DependencyInjection/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/DependencyInjection/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
index aa796b4172a..32e219ccc64 100644
--- a/src/DependencyInjection/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
+++ b/src/DependencyInjection/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
@@ -11,7 +11,7 @@
       https://github.com/dotnet/corefx/issues/12338 & https://github.com/dotnet/corefx/issues/11797
     -->
     <EnableApiCheck>false</EnableApiCheck>
-    <IsUnitTestProject>false</IsUnitTestProject>
+    <DisableArcadeTestFramework>true</DisableArcadeTestFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
index 008e8869d80..dd060b53a68 100644
--- a/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
+++ b/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\shared\**\*.cs" />
+    <Compile Include="..\..\Shared\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>