mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removing Additional Framework entirely and renaming LegacyRuntime to something more appropriate: BackwardsCompatibleRuntimes. Also, turning off some tests that I forgot to turn off for linux-x64.

Browse source
This commit is contained in:
Livar Cunha 2017-04-07 16:36:23 -07:00 committed by Livar Cunha
parent 4c926ec9c5
commit e286c65d25
20 changed files with 80 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
build/BackwardsCompatibilityRuntimes.props Normal file
View file

@ -0,0 +1,57 @@
<Project>
<PropertyGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
<BackwardsCompatibility110CoreSetupChannel>release/1.1.0</BackwardsCompatibility110CoreSetupChannel>
<BackwardsCompatibility110SharedFrameworkVersion>1.1.1</BackwardsCompatibility110SharedFrameworkVersion>
<BackwardsCompatibility110SharedHostVersion>1.1.0</BackwardsCompatibility110SharedHostVersion>
<BackwardsCompatibility110HostFxrVersion>1.1.0</BackwardsCompatibility110HostFxrVersion>
<BackwardsCompatibility110DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedSharedHostInstallerFileName>
<BackwardsCompatibility110DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)</BackwardsCompatibility110DownloadedSharedHostInstallerFile>
<BackwardsCompatibility110DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedHostFxrInstallerFileName>
<BackwardsCompatibility110DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)</BackwardsCompatibility110DownloadedHostFxrInstallerFile>
<BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName>
<BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)</BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile>
<BackwardsCompatibility110CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension)</BackwardsCompatibility110CombinedFrameworkHostCompressedFileName>
<BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(BackwardsCompatibility110CoreSetupChannel)</BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel>
<BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl>$(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Binaries/$(BackwardsCompatibility110SharedFrameworkVersion)</BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl>
<BackwardsCompatibility110CoreSetupInstallerBlobRootUrl>$(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Installers</BackwardsCompatibility110CoreSetupInstallerBlobRootUrl>
<BackwardsCompatibility110CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(BackwardsCompatibility110SharedFrameworkVersion)</BackwardsCompatibility110CoreSetupDownloadDirectory>
<BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive>$(BackwardsCompatibility110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive>
</PropertyGroup>
<ItemGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
<_DownloadAndExtractItem Include="BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')">
<Url>$(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)</Url>
<DownloadFileName>$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
<ExtractDestination>$(BackwardsCompatibilitySharedFrameworksPublishDirectory)</ExtractDestination>
<!-- don't overwrite the destination because there can be multiple shared fx's and they need to be combined -->
<OverwriteDestination>False</OverwriteDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile"
Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)</Url>
<DownloadFileName>$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile"
Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)</Url>
<DownloadFileName>$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile"
Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)</Url>
<DownloadFileName>$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
</ItemGroup>
</Project>

4
build/Branding.props
View file

@ -5,10 +5,6 @@
<SharedHostBrandName>Microsoft .NET Core 2.0.0 - Host</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core 2.0.0 - Host FX Resolver</HostFxrBrandName>
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</AdditionalSharedFrameworkBrandName>
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>

5
build/BuildDefaults.props
View file

@ -2,12 +2,9 @@
<PropertyGroup>
<CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<HasAdditionalSharedFramework Condition=" '$(HasAdditionalSharedFramework)' == '' ">false</HasAdditionalSharedFramework>
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' AND '$(HasAdditionalSharedFramework)' == 'true' ">true</IncludeAdditionalSharedFrameworks>
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks>
<IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
<UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' ">true</UsePortableLinuxSharedFramework>
<IncludeLegacySharedFramework Condition=" '$(Rid)' != 'linux-x64' ">true</IncludeLegacySharedFramework>
<IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == '' AND '$(Rid)' != 'linux-x64' ">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
</PropertyGroup>
</Project>

61
build/BundledRuntimes.props
View file

@ -17,26 +17,6 @@
<CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
</PropertyGroup>
<!-- Additional Shared Framework to be installed -->
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<AdditionalCoreSetupChannel>release/1.1.0</AdditionalCoreSetupChannel>
<AdditionalSharedFrameworkVersion>1.1.1</AdditionalSharedFrameworkVersion>
<AdditionalSharedHostVersion>1.1.0</AdditionalSharedHostVersion>
<AdditionalHostFxrVersion>1.1.0</AdditionalHostFxrVersion>
<!-- Additional Downloaded Installers + Archives -->
<AdditionalDownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)</AdditionalDownloadedSharedHostInstallerFileName>
<AdditionalDownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName)</AdditionalDownloadedSharedHostInstallerFile>
<AdditionalDownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension)</AdditionalDownloadedHostFxrInstallerFileName>
<AdditionalDownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName)</AdditionalDownloadedHostFxrInstallerFile>
<AdditionalDownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension)</AdditionalDownloadedSharedFrameworkInstallerFileName>
<AdditionalDownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)</AdditionalDownloadedSharedFrameworkInstallerFile>
<AdditionalCombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension)</AdditionalCombinedFrameworkHostCompressedFileName>
</PropertyGroup>
<PropertyGroup>
<CoreSetupChannel>master</CoreSetupChannel>
<CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
@ -76,45 +56,4 @@
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
</ItemGroup>
<!-- Additional Shared Framework to be installed -->
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
<AdditionalCoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)</AdditionalCoreSetupBlobRootUrlWithChannel>
<AdditionalSharedFrameworkArchiveBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)</AdditionalSharedFrameworkArchiveBlobRootUrl>
<AdditionalCoreSetupInstallerBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers</AdditionalCoreSetupInstallerBlobRootUrl>
<AdditionalCoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion)</AdditionalCoreSetupDownloadDirectory>
<AdditionalCombinedSharedHostAndFrameworkArchive>$(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</AdditionalCombinedSharedHostAndFrameworkArchive>
</PropertyGroup>
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
<_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
<Url>$(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)</Url>
<DownloadFileName>$(AdditionalCombinedSharedHostAndFrameworkArchive)</DownloadFileName>
<ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
<!-- don't overwrite the destination because both shared fx's need to be combined -->
<OverwriteDestination>False</OverwriteDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)</Url>
<DownloadFileName>$(AdditionalDownloadedSharedFrameworkInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)</Url>
<DownloadFileName>$(AdditionalDownloadedSharedHostInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)</Url>
<DownloadFileName>$(AdditionalDownloadedHostFxrInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
</ItemGroup>
</Project>

57
build/LegacyRuntimes.props
View file

@ -1,57 +0,0 @@
<Project>
<PropertyGroup Condition=" '$(IncludeLegacySharedFramework)' == 'true' ">
<Legacy110CoreSetupChannel>release/1.1.0</Legacy110CoreSetupChannel>
<Legacy110SharedFrameworkVersion>1.1.1</Legacy110SharedFrameworkVersion>
<Legacy110SharedHostVersion>1.1.0</Legacy110SharedHostVersion>
<Legacy110HostFxrVersion>1.1.0</Legacy110HostFxrVersion>
<Legacy110DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(Legacy110SharedHostVersion)$(InstallerExtension)</Legacy110DownloadedSharedHostInstallerFileName>
<Legacy110DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(Legacy110DownloadedSharedHostInstallerFileName)</Legacy110DownloadedSharedHostInstallerFile>
<Legacy110DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(Legacy110HostFxrVersion)$(InstallerExtension)</Legacy110DownloadedHostFxrInstallerFileName>
<Legacy110DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(Legacy110DownloadedHostFxrInstallerFileName)</Legacy110DownloadedHostFxrInstallerFile>
<Legacy110DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(Legacy110SharedFrameworkVersion)$(InstallerExtension)</Legacy110DownloadedSharedFrameworkInstallerFileName>
<Legacy110DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(Legacy110DownloadedSharedFrameworkInstallerFileName)</Legacy110DownloadedSharedFrameworkInstallerFile>
<Legacy110CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(Legacy110SharedFrameworkVersion)$(ArchiveExtension)</Legacy110CombinedFrameworkHostCompressedFileName>
<Legacy110CoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(Legacy110CoreSetupChannel)</Legacy110CoreSetupBlobRootUrlWithChannel>
<Legacy110SharedFrameworkArchiveBlobRootUrl>$(Legacy110CoreSetupBlobRootUrlWithChannel)/Binaries/$(Legacy110SharedFrameworkVersion)</Legacy110SharedFrameworkArchiveBlobRootUrl>
<Legacy110CoreSetupInstallerBlobRootUrl>$(Legacy110CoreSetupBlobRootUrlWithChannel)/Installers</Legacy110CoreSetupInstallerBlobRootUrl>
<Legacy110CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(Legacy110SharedFrameworkVersion)</Legacy110CoreSetupDownloadDirectory>
<Legacy110CombinedSharedHostAndFrameworkArchive>$(Legacy110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</Legacy110CombinedSharedHostAndFrameworkArchive>
</PropertyGroup>
<ItemGroup Condition=" '$(IncludeLegacySharedFramework)' == 'true' ">
<_DownloadAndExtractItem Include="Legacy110CombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(Legacy110CombinedSharedHostAndFrameworkArchive)')">
<Url>$(Legacy110SharedFrameworkArchiveBlobRootUrl)/$(Legacy110CombinedFrameworkHostCompressedFileName)</Url>
<DownloadFileName>$(Legacy110CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
<ExtractDestination>$(LegacySharedFrameworkPublishDirectory)</ExtractDestination>
<!-- don't overwrite the destination because there can be multiple shared fx's and they need to be combined -->
<OverwriteDestination>False</OverwriteDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="Legacy110DownloadedSharedFrameworkInstallerFile"
Condition="!Exists('$(Legacy110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110SharedFrameworkVersion)/$(Legacy110DownloadedSharedFrameworkInstallerFileName)</Url>
<DownloadFileName>$(Legacy110DownloadedSharedFrameworkInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="Legacy110DownloadedSharedHostInstallerFile"
Condition="!Exists('$(Legacy110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110SharedHostVersion)/$(Legacy110DownloadedSharedHostInstallerFileName)</Url>
<DownloadFileName>$(Legacy110DownloadedSharedHostInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="Legacy110DownloadedHostFxrInstallerFile"
Condition="!Exists('$(Legacy110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110HostFxrVersion)/$(Legacy110DownloadedHostFxrInstallerFileName)</Url>
<DownloadFileName>$(Legacy110DownloadedHostFxrInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
</ItemGroup>
</Project>

4
build/OutputDirectories.props
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
<OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory>
<Stage2WithLegacyRuntimeOutputDirectory>$(BaseOutputDirectory)/stage2WithLegacyRuntime</Stage2WithLegacyRuntimeOutputDirectory>
<Stage2WithBackwardsCompatibilityRuntimesOutputDirectory>$(BaseOutputDirectory)/stage2WithBackwardsCompatibilityRuntimes</Stage2WithBackwardsCompatibilityRuntimesOutputDirectory>
<SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
<SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory>
<RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
@ -10,7 +10,7 @@
<IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
<PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
<SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
<LegacySharedFrameworkPublishDirectory>$(IntermediateDirectory)/legacySharedFrameworkPublish</LegacySharedFrameworkPublishDirectory>
<BackwardsCompatibilitySharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibilitySharedFrameworksPublish</BackwardsCompatibilitySharedFrameworksPublishDirectory>
<TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
<DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>
<GeneratedMSBuildExtensionsDirectory>$(IntermediateDirectory)/GeneratedMSBuildExtensions</GeneratedMSBuildExtensionsDirectory>

17
build/package/Installer.DEB.proj
View file

@ -78,11 +78,6 @@
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target>
@ -95,13 +90,6 @@
Outputs="$(DebianTestResultsXmlFile)" >
<!-- Install Dependencies and SDK Packages -->
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
@ -121,11 +109,6 @@
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target>

7
build/package/Installer.DEB.targets
View file

@ -35,13 +35,6 @@
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
<HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
<HostDebianPackageName>dotnet-host</HostDebianPackageName>
<AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
<AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
<AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
<AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
<AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
<AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
</PropertyGroup>
<!-- Inputs -->

3
build/package/Installer.MSI.targets
View file

@ -115,9 +115,6 @@
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript)
'$(SdkInstallerFile)'
'$(AdditionalDownloadedSharedFrameworkInstallerFile)'
'$(AdditionalDownloadedHostFxrInstallerFile)'
'$(AdditionalDownloadedSharedHostInstallerFile)'
'$(DownloadedSharedFrameworkInstallerFile)'
'$(DownloadedHostFxrInstallerFile)'
'$(DownloadedSharedHostInstallerFile)'

46
build/package/Installer.PKG.targets
View file

@ -10,10 +10,6 @@
<SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
<SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
<AdditionalSharedHostComponentId>com.microsoft.dotnet.sharedhost.$(AdditionalSharedHostVersion).component.osx.x64</AdditionalSharedHostComponentId>
<AdditionalHostFxrComponentId>com.microsoft.dotnet.hostfxr.$(AdditionalHostFxrVersion).component.osx.x64</AdditionalHostFxrComponentId>
<AdditionalSharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(AdditionalSharedFrameworkVersion).component.osx.x64</AdditionalSharedFrameworkComponentId>
<PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
<SdkPkgSourcesRootDirectory>$(RepoRoot)/packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
@ -21,17 +17,12 @@
<SdkProductArchiveResourcesDirectory>$(SdkPkgSourcesRootDirectory)/resources</SdkProductArchiveResourcesDirectory>
<SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
<SdkProductArchiveDistributionTemplateFile Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">$(SdkPkgSourcesRootDirectory)/Distribution-TemplateWithAdditionalRuntime</SdkProductArchiveDistributionTemplateFile>
<SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
<SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
<SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
<SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
<HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
<AdditionalSharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedFrameworkComponentId).pkg</AdditionalSharedFrameworkPkgIntermediatePath>
<AdditionalSharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedHostComponentId).pkg</AdditionalSharedHostPkgIntermediatePath>
<AdditionalHostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg</AdditionalHostFxrPkgIntermediatePath>
</PropertyGroup>
<Target Name="SetupPkgInputsOutputs">
@ -64,28 +55,6 @@
<ReplacementString>$(HostFxrBrandName)</ReplacementString>
</DistributionTemplateReplacement>
</ItemGroup>
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<DistributionTemplateReplacement Include="{AdditionalSharedFxComponentId}">
<ReplacementString>$(AdditionalSharedFrameworkComponentId)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{AdditionalSharedHostComponentId}">
<ReplacementString>$(AdditionalSharedHostComponentId)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{AdditionalHostFxrComponentId}">
<ReplacementString>$(AdditionalHostFxrComponentId)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{AdditionalSharedFxBrandName}">
<ReplacementString>$(AdditionalSharedFrameworkBrandName)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{AdditionalSharedHostBrandName}">
<ReplacementString>$(AdditionalSharedHostBrandName)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{AdditionalHostFxrBrandName}">
<ReplacementString>$(AdditionalHostFxrBrandName)</ReplacementString>
</DistributionTemplateReplacement>
</ItemGroup>
<!-- Consumed By Publish -->
<ItemGroup>
@ -103,12 +72,6 @@
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
</ItemGroup>
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedFrameworkInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedHostFxrInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedHostInstallerFile)" />
</ItemGroup>
</Target>
<Target Name="GenerateSdkPkg"
@ -142,15 +105,6 @@
$(SharedHostPkgIntermediatePath)" />
</ItemGroup>
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<PkgComponentsSourceFiles Include="$(AdditionalDownloadedSharedFrameworkInstallerFile);
$(AdditionalDownloadedHostFxrInstallerFile);
$(AdditionalDownloadedSharedHostInstallerFile)" />
<PkgComponentsDestinationFiles Include="$(AdditionalSharedFrameworkPkgIntermediatePath);
$(AdditionalHostFxrPkgIntermediatePath);
$(AdditionalSharedHostPkgIntermediatePath)" />
</ItemGroup>
<!-- Move ProductArchive pkg components into place with component ids in the filenames -->
<Copy SourceFiles="@(PkgComponentsSourceFiles)" DestinationFiles="@(PkgComponentsDestinationFiles)" />

2
dir.props
View file

@ -36,7 +36,7 @@
<Import Project="build/CrossGen.props" />
<Import Project="build/VersionBadge.props" />
<Import Project="build/BundledRuntimes.props" />
<Import Project="build/LegacyRuntimes.props" />
<Import Project="build/BackwardsCompatibilityRuntimes.props" />
<Import Project="build/AzureInfo.props" />
<Import Project="build/InstallerInfo.props" />

53
packaging/osx/clisdk/Distribution-TemplateWithAdditionalRuntime
View file

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>{CLISdkBrandName} (x64)</title>
<license file="eula.rtf" mime-type="application/rtf" />
<background file="dotnetbackground.png" mime-type="image/png"/>
<options customize="never" require-scripts="false" />
<welcome file="welcome.html" mime-type="text/html" />
<conclusion file="conclusion.html" mime-type="text/html" />
<volume-check>
<allowed-os-version>
<os-version min="10.10" />
</allowed-os-version>
</volume-check>
<choices-outline>
<line choice="{SharedFxComponentId}.pkg" />
<line choice="{HostFxrComponentId}.pkg" />
<line choice="{SharedHostComponentId}.pkg" />
<line choice="{AdditionalSharedFxComponentId}.pkg" />
<line choice="{AdditionalHostFxrComponentId}.pkg" />
<line choice="{AdditionalSharedHostComponentId}.pkg" />
<line choice="{CLISdkComponentId}.pkg"/>
</choices-outline>
<choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
<pkg-ref id="{SharedFxComponentId}.pkg" />
</choice>
<choice id="{HostFxrComponentId}.pkg" visible="true" title="{HostFxrBrandName} (x64)" description="The .NET Core Host FX Resolver">
<pkg-ref id="{HostFxrComponentId}.pkg" />
</choice>
<choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
<pkg-ref id="{SharedHostComponentId}.pkg" />
</choice>
<choice id="{AdditionalSharedFxComponentId}.pkg" visible="true" title="{AdditionalSharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
<pkg-ref id="{AdditionalSharedFxComponentId}.pkg" />
</choice>
<choice id="{AdditionalHostFxrComponentId}.pkg" visible="true" title="{AdditionalHostFxrBrandName} (x64)" description="The .NET Core Host FX Resolver">
<pkg-ref id="{AdditionalHostFxrComponentId}.pkg" />
</choice>
<choice id="{AdditionalSharedHostComponentId}.pkg" visible="true" title="{AdditionalSharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
<pkg-ref id="{AdditionalSharedHostComponentId}.pkg" />
</choice>
<choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
<pkg-ref id="{CLISdkComponentId}.pkg"/>
</choice>
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
<pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
<pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
<pkg-ref id="{AdditionalSharedFxComponentId}.pkg">{AdditionalSharedFxComponentId}.pkg</pkg-ref>
<pkg-ref id="{AdditionalHostFxrComponentId}.pkg">{AdditionalHostFxrComponentId}.pkg</pkg-ref>
<pkg-ref id="{AdditionalSharedHostComponentId}.pkg">{AdditionalSharedHostComponentId}.pkg</pkg-ref>
<pkg-ref id="{CLISdkComponentId}.pkg">{CLISdkComponentId}.pkg</pkg-ref>
</installer-gui-script>

9
packaging/windows/clisdk/bundle.wxs
View file

@ -55,15 +55,6 @@
<MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
<MsiPackage SourceFile="$(var.AdditionalSharedFXMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
<MsiPackage SourceFile="$(var.AdditionalHostFXRMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
<MsiPackage SourceFile="$(var.AdditionalSharedHostMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
</Chain>
</Bundle>

3
packaging/windows/clisdk/generatebundle.ps1
View file

@ -6,9 +6,6 @@ param(
[Parameter(Mandatory=$true)][string]$SharedFxMSIFile,
[Parameter(Mandatory=$true)][string]$HostFxrMSIFile,
[Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
[Parameter(Mandatory=$true)][string]$AdditionalSharedFxMSIFile,
[Parameter(Mandatory=$true)][string]$AdditionalHostFxrMSIFile,
[Parameter(Mandatory=$true)][string]$AdditionalSharedHostMSIFile,
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,

2
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
.Should()
.Pass();
new DotnetCommand(DotnetUnderTest.WithLegacyRuntime)
new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput(
$"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.0 portable")

6
test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs
View file

@ -24,11 +24,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
}
}
public static string WithLegacyRuntime
public static string WithBackwardsCompatibleRuntimes
{
get
{
return Path.Combine(new RepoDirectoriesProvider().Stage2WithLegacyRuntimeDirectory, "dotnet");
return Path.Combine(
new RepoDirectoriesProvider().Stage2WithBackwardsCompatibleRuntimesDirectory,
"dotnet");
}
}
}

7
test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private string _builtDotnet;
private string _nugetPackages;
private string _stage2Sdk;
private string _stage2WithLegacyRuntimeDirectory;
private string _stage2WithBackwardsCompatibleRuntimesDirectory;
private string _testPackages;
private string _pjDotnet;
@ -83,7 +83,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public string NugetPackages => _nugetPackages;
public string PjDotnet => _pjDotnet;
public string Stage2Sdk => _stage2Sdk;
public string Stage2WithLegacyRuntimeDirectory => _stage2WithLegacyRuntimeDirectory;
public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory;
public string TestPackages => _testPackages;
public RepoDirectoriesProvider(
@ -99,7 +99,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
_nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
_pjDotnet = pjDotnet ?? GetPjDotnetPath();
_stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First();
_stage2WithLegacyRuntimeDirectory = Path.Combine(_artifacts, "stage2WithLegacyRuntime");
_stage2WithBackwardsCompatibleRuntimesDirectory =
Path.Combine(_artifacts, "stage2WithBackwardsCompatibilityRuntimes");
_testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages");
}

14
test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
View file

@ -406,7 +406,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceFiles' option is deprecated. Use 'embed' in 'buildOptions' instead.");
}
[Fact]
[RequiresSpecificFrameworkFact("netcoreapp1.0")]
public void MigratingDeprecatedResource()
{
var projectDirectory = TestAssets
@ -431,7 +431,7 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
var cmd = new DotnetCommand(DotnetUnderTest.WithLegacyRuntime)
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug");
cmd.Should().Pass();
@ -448,7 +448,7 @@ namespace Microsoft.DotNet.Migration.Tests
.Root
.GetDirectory("project");
var cmd = new DotnetCommand(DotnetUnderTest.WithLegacyRuntime)
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("migrate");
@ -458,7 +458,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceBuiltIn' option is deprecated. Use 'embed' in 'buildOptions' instead.");
}
[Fact]
[RequiresSpecificFrameworkFact("netcoreapp1.0")]
public void MigratingDeprecatedResourceBuiltIn()
{
var projectDirectory = TestAssets
@ -483,7 +483,7 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
var cmd = new DotnetCommand(DotnetUnderTest.WithLegacyRuntime)
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug");
cmd.Should().Pass();
@ -510,7 +510,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceExclude' option is deprecated. Use 'embed' in 'buildOptions' instead.");
}
[Fact]
[RequiresSpecificFrameworkFact("netcoreapp1.0")]
public void MigratingDeprecatedResourceExclude()
{
var projectDirectory = TestAssets
@ -534,7 +534,7 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
var cmd = new DotnetCommand(DotnetUnderTest.WithLegacyRuntime)
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug");
cmd.Should().Pass();

2
test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs
View file

@ -759,7 +759,7 @@ namespace Microsoft.DotNet.Migration.Tests
foreach (var dll in runnableDlls)
{
new DotnetCommand(DotnetUnderTest.WithLegacyRuntime).ExecuteWithCapturedOutput($"\"{dll.FullName}\"").Should().Pass();
new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes).ExecuteWithCapturedOutput($"\"{dll.FullName}\"").Should().Pass();
}
}

4
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -128,7 +128,7 @@ namespace Microsoft.DotNet.Tests
.Execute()
.Should().Pass();
new DependencyToolInvokerCommand(DotnetUnderTest.WithLegacyRuntime)
new DependencyToolInvokerCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(testInstance.Root)
.WithEnvironmentVariable(CommandContext.Variables.Verbose, "true")
.ExecuteWithCapturedOutput($"tool-with-output-name", framework, "")
@ -250,7 +250,7 @@ namespace Microsoft.DotNet.Tests
.WithSourceFiles()
.WithRestoreFiles();
new DependencyContextTestCommand(DotnetUnderTest.WithLegacyRuntime)
new DependencyContextTestCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(testInstance.Root)
.Execute("")
.Should().Pass();