Merge pull request #11 from tannergooding/dev/repo-refactoring

Updating the toolset version to 2.0.3-refac-007111

Directory.Build.props

@@ -57,6 +57,7 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
     <Import Project="build/VersionBadge.props" />
     <Import Project="build/BundledRuntimes.props" />
     <Import Project="build/BundledToolset.props" />
+    <Import Project="build/DotnetCoreSdkLKG.props" />
     <Import Project="build/CrossGen.props" />
     <Import Project="build/BackwardsCompatibilityRuntimes.props" />
 

build/Branding.props

@@ -20,9 +20,9 @@
         '$(HostRid)' == 'opensuse.42.1-x64' ">$(HostRid)</HostMonikerRid>
     <HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
 
-    <ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
+    <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-    <ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
+    <ArtifactNameSdkDebug>dotnet-toolset-internal-debug</ArtifactNameSdkDebug>
-    <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
+    <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-toolset</ArtifactNameCombinedHostHostFxrFrameworkSdk>
     <ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
 
     <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>

build/BundledToolset.props

@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ToolsetCompressedFileName>$(ArtifactNameSdk)-$(ToolsetVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</ToolsetCompressedFileName>
+    <ToolsetCompressedFileName>$(ArtifactNameSdk)-$(ToolsetVersion)$(ArchiveExtension)</ToolsetCompressedFileName>
   </PropertyGroup>
 
   <PropertyGroup>

build/DependencyVersions.props

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <DotNetCoreSdkLKGVersion>2.0.3-servicing-007050</DotNetCoreSdkLKGVersion>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.4.8</CLI_MSBuild_Version>
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
 
-    <ToolsetVersion>2.0.3-servicing-007037</ToolsetVersion>
+    <ToolsetVersion>2.0.3-refac-007111</ToolsetVersion>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

build/DotnetCoreSdkLKG.props

@@ -0,0 +1,29 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CoreSetupRid>$(HostRid)</CoreSetupRid>
+    <CoreSetupRid Condition=" '$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' ">$(HostMonikerRid)</CoreSetupRid>
+
+    <!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
+         NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
+    <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
+    <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
+
+    <DotNetCoreSdkLKGCompressedFileName>dotnet-sdk-$(DotNetCoreSdkLKGVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</DotNetCoreSdkLKGCompressedFileName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DotNetCoreSdkLKGRootUrl>$(DotnetBlobRootUrl)/Sdk/$(DotNetCoreSdkLKGVersion)/</DotNetCoreSdkLKGRootUrl>
+    <DotNetCoreSdkLKGDownloadUrl>$(DotNetCoreSdkLKGRootUrl)$(DotNetCoreSdkLKGCompressedFileName)$(CoreSetupBlobAccessTokenParam)</DotNetCoreSdkLKGDownloadUrl>
+    <DotNetCoreSdkLKGDownloadDirectory>$(IntermediateDirectory)/SDKDownloadForTests/$(DotNetCoreSdkLKGVersion)/</DotNetCoreSdkLKGDownloadDirectory>
+    <DotNetCoreSdkLKGArchive>$(DotNetCoreSdkLKGDownloadDirectory)$(DotNetCoreSdkLKGCompressedFileName)</DotNetCoreSdkLKGArchive>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_DownloadAndExtractItem Include="DotNetCoreSdkLKGArchive"
+                           Condition="!Exists('$(DotNetCoreSdkLKGArchive)')">
+      <Url>$(DotNetCoreSdkLKGDownloadUrl)</Url>
+      <DownloadFileName>$(DotNetCoreSdkLKGArchive)</DownloadFileName>
+      <ExtractDestination>$(DotNetCoreSdkLKGPublishDirectory)</ExtractDestination>
+    </_DownloadAndExtractItem>
+  </ItemGroup>
+</Project>

build/Test.targets

@@ -1,12 +1,13 @@
 <Project ToolsVersion="14.0" DefaultTargets="Test">
   <Import Project="test/TestPackageProjects.targets" />
   <Import Project="test/TestProjects.targets" />
+  <Import Project="test/OverlaySdkOnLKG.targets" />
 
   <PropertyGroup>
     <PathListSeparator>:</PathListSeparator>
-    <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
+    <PathListSeparator Condition=" '$(OS)' == 'Windows_NT' ">%3b</PathListSeparator>
-    <ExecPath>$(OutputDirectory)$(PathListSeparator)$(PATH)</ExecPath>
+    <ExecPath>$(SdkOutputDirectory)$(PathListSeparator)$(PATH)</ExecPath>
-    <ExecPath Condition=" '$(OSName)' == 'win' ">$(OutputDirectory)</ExecPath>
+    <ExecPath Condition=" '$(OS)' == 'Windows_NT' ">$(OutputDirectory)</ExecPath>
     <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
     <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
     <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
@@ -29,12 +30,41 @@
           PreviousStageProps=$(NextStagePropsPath);
           TestProject=%(TestProjects.Identity);
           TestResultXmlDir=$(TestResultXmlDir);
-          ToolPath=$(OutputDirectory);
+          ToolPath=$(SdkOutputDirectory);
           WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity)))
         </Properties>
       </ProjectsToTest>
     </ItemGroup>
 
+    <!-- Begin Workaround lack of a stable package version for depedencies; copy into simulated stable version folders -->
+ 
+    <PropertyGroup>
+        <StableSharedFrameworkDirectory>$(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectory>
+        <StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>
+    </PropertyGroup>
+
+    <ItemGroup>  
+        <Stabilize_SourceFiles_2_0 Include="$(OutputDirectory)/shared/Microsoft.NETCore.App/$(MicrosoftNETCoreAppPackageVersion)/*.*"/>
+        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+                                          Include="$(StableSharedFrameworkDirectory)" />
+        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+                                          Include="$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)" />
+    </ItemGroup>
+
+    <Copy
+        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+        SourceFiles="@(Stabilize_SourceFiles_2_0)"
+        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectory)/%(RecursiveDir)%(Filename)%(Extension)')"
+    />
+
+    <Copy
+        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+        SourceFiles="@(Stabilize_SourceFiles_2_0)"
+        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)/%(RecursiveDir)%(Filename)%(Extension)')"
+    />
+ 
+    <!-- End Workaround lack of a stable package version for depedencies; copy into simulated stable versions -->
+
     <Message Text="Starting test execution" Importance="High" />
   
     <MSBuild
@@ -43,25 +73,32 @@
     </MSBuild>
 
     <Message Text="Finished test execution" Importance="High" />
+
+    <!-- Begin Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
+
+    <RemoveDir Directories="@(SimulatedStableSharedFrameworkDirectories)" />
+ 
+    <!-- End Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
   </Target>
 
   <Target Name="PrepareTests"
           DependsOnTargets="Init;
-                            SetupTestProjectData">
+                            SetupTestProjectData;
+                            OverlaySdkOnLKG">
     <MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
   </Target>
 
   <Target Name="RestoreTests"
           DependsOnTargets="PrepareTests;
                             CreateTestAssetPackageNuPkgs;">
-    <DotNetRestore ToolPath="$(OutputDirectory)"
+    <DotNetRestore ToolPath="$(SdkOutputDirectory)"
                    ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;"
                    AdditionalParameters="/p:PreviousStageProps=$(NextStagePropsPath)" />
   </Target>
 
   <Target Name="BuildTests"
           DependsOnTargets="RestoreTests;">
-    <DotNetBuild ToolPath="$(OutputDirectory)"
+    <DotNetBuild ToolPath="$(SdkOutputDirectory)"
                  ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;"
                  AdditionalParameters="/p:PreviousStageProps=$(NextStagePropsPath)"
                  MaxCpuCount="1" />
@@ -71,7 +108,7 @@
           DependsOnTargets="SetupTestPackageProjectData;"
           Outputs="%(TestPackageProject.Identity)">
 
-    <DotNetRestore ToolPath="$(OutputDirectory)"
+    <DotNetRestore ToolPath="$(SdkOutputDirectory)"
                    WorkingDirectory="$([System.IO.Directory]::GetParent('%(TestPackageProject.ProjectPath)'))"
                    ProjectPath="%(TestPackageProject.ProjectPath)"
                    AdditionalParameters="/p:RestoreAdditionalProjectSources=$(TestOutputDir)/packages /p:PreviousStageProps=$(NextStagePropsPath)"
@@ -80,14 +117,14 @@
     <!-- https://github.com/NuGet/Home/issues/4063 -->
     <DotNetPack Output="$(TestPackagesDir)"
                 ProjectPath="%(TestPackageProject.ProjectPath)"
-                ToolPath="$(OutputDirectory)"
+                ToolPath="$(SdkOutputDirectory)"
                 VersionSuffix="%(TestPackageProject.VersionSuffix)"
                 MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion) /p:RestoreAdditionalProjectSources=$(TestOutputDir)/packages /p:PreviousStageProps=$(NextStagePropsPath)" />
 
   </Target>
 
   <Target Name="EnsureStageSeparation">
-    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:OutputDirectory=&quot;$(OutputDirectory)&quot;"
+    <DotNetMSBuild Arguments="/v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:OutputDirectory=&quot;$(SdkOutputDirectory)&quot;"
                    ToolPath="$(PreviousStageDirectory)" />
   </Target>
 </Project>

build/test/OverlaySdkOnLKG.targets

@@ -0,0 +1,23 @@
+<Project ToolsVersion="14.0" DefaultTargets="Test">
+  <Target Name="OverlaySdkOnLKG">
+    <ItemGroup>
+      <OverlaySDK Include="$(DotNetCoreSdkLKGPublishDirectory)/**/*" />
+      <OverlayCLI Include="$(OutputDirectory)/**/*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(OverlaySDK)"
+          DestinationFiles="@(OverlaySDK->'$(SdkOutputDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <ItemGroup>
+      <OldSdk Include="$(SdkOutputDirectory)/sdk/$(DotNetCoreSdkLKGVersion)/**/*" />
+    </ItemGroup>
+
+    <Move SourceFiles="@(OldSdk)"
+          DestinationFiles="@(OldSdk->'$(SdkOutputDirectory)\sdk\$(SdkVersion)\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <RemoveDir Directories="$(SdkOutputDirectory)/sdk/$(DotNetCoreSdkLKGVersion)" />
+
+    <Copy SourceFiles="@(OverlayCLI)"
+          DestinationFiles="@(OverlayCLI->'$(SdkOutputDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+</Project>