diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props new file mode 100644 index 000000000..503e40d71 --- /dev/null +++ b/build/BackwardsCompatibilityRuntimes.props @@ -0,0 +1,57 @@ + + + release/1.1.0 + 1.1.1 + 1.1.0 + 1.1.0 + + dotnet-host-$(ProductMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) + + dotnet-hostfxr-$(ProductMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) + + dotnet-sharedframework-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) + + dotnet-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension) + + $(CoreSetupBlobRootUrl)$(BackwardsCompatibility110CoreSetupChannel) + $(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Binaries/$(BackwardsCompatibility110SharedFrameworkVersion) + $(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Installers + $(IntermediateDirectory)/coreSetupDownload/$(BackwardsCompatibility110SharedFrameworkVersion) + $(BackwardsCompatibility110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive + + + + <_DownloadAndExtractItem Include="BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive" + Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')"> + $(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName) + $(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive) + $(BackwardsCompatibilitySharedFrameworksPublishDirectory) + + False + + + <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile" + Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) + $(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile) + + + + <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile" + Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) + $(BackwardsCompatibility110DownloadedSharedHostInstallerFile) + + + + <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile" + Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) + $(BackwardsCompatibility110DownloadedHostFxrInstallerFile) + + + + \ No newline at end of file diff --git a/build/Branding.props b/build/Branding.props index 83241f0bb..a49ecbeef 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -5,10 +5,6 @@ Microsoft .NET Core 2.0.0 - Host Microsoft .NET Core 2.0.0 - Host FX Resolver - Microsoft .NET Core 1.0.3 - Runtime - Microsoft .NET Core 1.0.1 - Host - Microsoft .NET Core 1.0.1 - Host FX Resolver - Microsoft.NETCore.App $(SharedFrameworkName) diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 5920d181c..cb697dbf1 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -2,12 +2,9 @@ Prepare;Compile;Test;Package;Publish Debug - false - true - false true false true - true + true diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 7122b7c8f..0603597c7 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -17,26 +17,6 @@ dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension) - - - release/1.1.0 - 1.1.1 - 1.1.0 - 1.1.0 - - - dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName) - - dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName) - - dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) - - dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension) - - master https://dotnetcli.azureedge.net/dotnet/ @@ -76,45 +56,4 @@ - - - - $(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel) - $(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion) - $(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers - $(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion) - $(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive - - - - <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive" - Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')"> - $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName) - $(AdditionalCombinedSharedHostAndFrameworkArchive) - $(SharedFrameworkPublishDirectory) - - False - - - <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) - $(AdditionalDownloadedSharedFrameworkInstallerFile) - - - - <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName) - $(AdditionalDownloadedSharedHostInstallerFile) - - - - <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName) - $(AdditionalDownloadedHostFxrInstallerFile) - - - diff --git a/build/LegacyRuntimes.props b/build/LegacyRuntimes.props deleted file mode 100644 index 3ece929da..000000000 --- a/build/LegacyRuntimes.props +++ /dev/null @@ -1,57 +0,0 @@ - - - release/1.1.0 - 1.1.1 - 1.1.0 - 1.1.0 - - dotnet-host-$(ProductMonikerRid).$(Legacy110SharedHostVersion)$(InstallerExtension) - $(PackagesDirectory)/$(Legacy110DownloadedSharedHostInstallerFileName) - - dotnet-hostfxr-$(ProductMonikerRid).$(Legacy110HostFxrVersion)$(InstallerExtension) - $(PackagesDirectory)/$(Legacy110DownloadedHostFxrInstallerFileName) - - dotnet-sharedframework-$(ProductMonikerRid).$(Legacy110SharedFrameworkVersion)$(InstallerExtension) - $(PackagesDirectory)/$(Legacy110DownloadedSharedFrameworkInstallerFileName) - - dotnet-$(ProductMonikerRid).$(Legacy110SharedFrameworkVersion)$(ArchiveExtension) - - $(CoreSetupBlobRootUrl)$(Legacy110CoreSetupChannel) - $(Legacy110CoreSetupBlobRootUrlWithChannel)/Binaries/$(Legacy110SharedFrameworkVersion) - $(Legacy110CoreSetupBlobRootUrlWithChannel)/Installers - $(IntermediateDirectory)/coreSetupDownload/$(Legacy110SharedFrameworkVersion) - $(Legacy110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive - - - - <_DownloadAndExtractItem Include="Legacy110CombinedSharedHostAndFrameworkArchive" - Condition="!Exists('$(Legacy110CombinedSharedHostAndFrameworkArchive)')"> - $(Legacy110SharedFrameworkArchiveBlobRootUrl)/$(Legacy110CombinedFrameworkHostCompressedFileName) - $(Legacy110CombinedSharedHostAndFrameworkArchive) - $(LegacySharedFrameworkPublishDirectory) - - False - - - <_DownloadAndExtractItem Include="Legacy110DownloadedSharedFrameworkInstallerFile" - Condition="!Exists('$(Legacy110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110SharedFrameworkVersion)/$(Legacy110DownloadedSharedFrameworkInstallerFileName) - $(Legacy110DownloadedSharedFrameworkInstallerFile) - - - - <_DownloadAndExtractItem Include="Legacy110DownloadedSharedHostInstallerFile" - Condition="!Exists('$(Legacy110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110SharedHostVersion)/$(Legacy110DownloadedSharedHostInstallerFileName) - $(Legacy110DownloadedSharedHostInstallerFile) - - - - <_DownloadAndExtractItem Include="Legacy110DownloadedHostFxrInstallerFile" - Condition="!Exists('$(Legacy110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(Legacy110CoreSetupInstallerBlobRootUrl)/$(Legacy110HostFxrVersion)/$(Legacy110DownloadedHostFxrInstallerFileName) - $(Legacy110DownloadedHostFxrInstallerFile) - - - - \ No newline at end of file diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index 63c232211..331d19e7c 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -2,7 +2,7 @@ $(RepoRoot)/artifacts/$(Rid) $(BaseOutputDirectory)/stage2 - $(BaseOutputDirectory)/stage2WithLegacyRuntime + $(BaseOutputDirectory)/stage2WithBackwardsCompatibilityRuntimes $(OutputDirectory)/sdk/$(SdkVersion) $(BaseOutputDirectory)/stage2symbols $(SdkOutputDirectory)/Roslyn @@ -10,7 +10,7 @@ $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish - $(IntermediateDirectory)/legacySharedFrameworkPublish + $(IntermediateDirectory)/backwardsCompatibilitySharedFrameworksPublish $(RepoRoot)/artifacts/testpackages/ $(OutputDirectory)/dotnet$(ExeExtension) $(IntermediateDirectory)/GeneratedMSBuildExtensions diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 7bb7dd108..f151ba1e5 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -78,11 +78,6 @@ - - - @@ -95,13 +90,6 @@ Outputs="$(DebianTestResultsXmlFile)" > - - - - @@ -121,11 +109,6 @@ - - - diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 57ae70bbe..1a041fe20 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,13 +35,6 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - - $(AdditionalSharedFrameworkVersion) - dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion) - $(AdditionalSharedFxDebianPackageName.ToLower()) - $(AdditionalHostFxrVersion) - dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion) - $(AdditionalHostFxrDebianPackageName.ToLower()) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index ab2d0b8b3..86e81c22b 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -115,9 +115,6 @@ $(SdkPkgSourcesRootDirectory)/Distribution-TemplateWithAdditionalRuntime $(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml $(PkgIntermediateDirectory)/$(SdkComponentId).pkg $(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg $(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg $(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg - - $(PkgIntermediateDirectory)/$(AdditionalSharedFrameworkComponentId).pkg - $(PkgIntermediateDirectory)/$(AdditionalSharedHostComponentId).pkg - $(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg @@ -64,28 +55,6 @@ $(HostFxrBrandName) - - - - - $(AdditionalSharedFrameworkComponentId) - - - $(AdditionalSharedHostComponentId) - - - $(AdditionalHostFxrComponentId) - - - $(AdditionalSharedFrameworkBrandName) - - - $(AdditionalSharedHostBrandName) - - - $(AdditionalHostFxrBrandName) - - @@ -103,12 +72,6 @@ - - - - - - - - - - - diff --git a/dir.props b/dir.props index bcd7e6a58..1636c331f 100644 --- a/dir.props +++ b/dir.props @@ -36,7 +36,7 @@ - + diff --git a/packaging/osx/clisdk/Distribution-TemplateWithAdditionalRuntime b/packaging/osx/clisdk/Distribution-TemplateWithAdditionalRuntime deleted file mode 100644 index 34f298981..000000000 --- a/packaging/osx/clisdk/Distribution-TemplateWithAdditionalRuntime +++ /dev/null @@ -1,53 +0,0 @@ - - - {CLISdkBrandName} (x64) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {SharedFxComponentId}.pkg - {HostFxrComponentId}.pkg - {SharedHostComponentId}.pkg - {AdditionalSharedFxComponentId}.pkg - {AdditionalHostFxrComponentId}.pkg - {AdditionalSharedHostComponentId}.pkg - {CLISdkComponentId}.pkg - diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index e4a4fd084..1ab894dd5 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -55,15 +55,6 @@ - - - - - - - - - diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1 index baeeb5281..2677fdd46 100644 --- a/packaging/windows/clisdk/generatebundle.ps1 +++ b/packaging/windows/clisdk/generatebundle.ps1 @@ -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, diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index bc32f1ab4..6a25894ce 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -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") diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs index 6c6854f54..54094b217 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs @@ -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"); } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index ead1ed6f4..01d54ed16 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -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"); } diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs index c4657ce01..3b903990b 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs @@ -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(); diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index f1142eae5..6a390cd9e 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -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(); } } diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index feec54f99..e1816ca8f 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -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();