diff --git a/Directory.Build.props b/Directory.Build.props index f17318773..044792b52 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -57,6 +57,7 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj + diff --git a/build/Branding.props b/build/Branding.props index d79177a50..9f61c1447 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -20,9 +20,9 @@ '$(HostRid)' == 'opensuse.42.1-x64' ">$(HostRid) $(HostOSName)-$(Architecture) - dotnet-sdk-internal - dotnet-sdk-debug - dotnet-sdk + dotnet-toolset-internal + dotnet-toolset-internal-debug + dotnet-toolset $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) diff --git a/build/BundledToolset.props b/build/BundledToolset.props index ec75255f6..76a2182e2 100644 --- a/build/BundledToolset.props +++ b/build/BundledToolset.props @@ -1,6 +1,6 @@ - $(ArtifactNameSdk)-$(ToolsetVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(ArtifactNameSdk)-$(ToolsetVersion)$(ArchiveExtension) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 37ecf283b..af35354a4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,11 +1,12 @@ + 2.0.3-servicing-007050 2.0.0 15.4.8 4.4.0-preview3-4475 - 2.0.3-servicing-007037 + 2.0.3-refac-007111 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) diff --git a/build/DotnetCoreSdkLKG.props b/build/DotnetCoreSdkLKG.props new file mode 100644 index 000000000..bb5724155 --- /dev/null +++ b/build/DotnetCoreSdkLKG.props @@ -0,0 +1,29 @@ + + + $(HostRid) + $(HostMonikerRid) + + + $(CoreSetupRid) + linux-x64 + + dotnet-sdk-$(DotNetCoreSdkLKGVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + + + + $(DotnetBlobRootUrl)/Sdk/$(DotNetCoreSdkLKGVersion)/ + $(DotNetCoreSdkLKGRootUrl)$(DotNetCoreSdkLKGCompressedFileName)$(CoreSetupBlobAccessTokenParam) + $(IntermediateDirectory)/SDKDownloadForTests/$(DotNetCoreSdkLKGVersion)/ + $(DotNetCoreSdkLKGDownloadDirectory)$(DotNetCoreSdkLKGCompressedFileName) + + + + <_DownloadAndExtractItem Include="DotNetCoreSdkLKGArchive" + Condition="!Exists('$(DotNetCoreSdkLKGArchive)')"> + $(DotNetCoreSdkLKGDownloadUrl) + $(DotNetCoreSdkLKGArchive) + $(DotNetCoreSdkLKGPublishDirectory) + + + diff --git a/build/Test.targets b/build/Test.targets index 18880e1e5..380c576d5 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -1,12 +1,13 @@ + : - %3b - $(OutputDirectory)$(PathListSeparator)$(PATH) - $(OutputDirectory) + %3b + $(SdkOutputDirectory)$(PathListSeparator)$(PATH) + $(OutputDirectory) $(TestOutputDir)/packages/ $(TestOutputDir)/artifacts/ $(TestOutputDir)/results/ @@ -29,12 +30,41 @@ PreviousStageProps=$(NextStagePropsPath); TestProject=%(TestProjects.Identity); TestResultXmlDir=$(TestResultXmlDir); - ToolPath=$(OutputDirectory); + ToolPath=$(SdkOutputDirectory); WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) + + + + $(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion) + $(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion) + + + + + + + + + + + + + + + + + + + + + SetupTestProjectData; + OverlaySdkOnLKG"> - - @@ -71,7 +108,7 @@ DependsOnTargets="SetupTestPackageProjectData;" Outputs="%(TestPackageProject.Identity)"> - - diff --git a/build/test/OverlaySdkOnLKG.targets b/build/test/OverlaySdkOnLKG.targets new file mode 100644 index 000000000..c940d757f --- /dev/null +++ b/build/test/OverlaySdkOnLKG.targets @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file