From d613ec575875e3229cd45d54715f73a4fe0e6838 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 30 Nov 2017 11:19:17 -0800
Subject: [PATCH] Making the cli-test-env shell script runnable and removing
 test workaround for preview runtimes. It is not needed in master.

---
 build/BundledRuntimes.props                   |  3 --
 build/Test.targets                            | 35 -------------------
 build/package/Installer.DEB.proj              |  2 +-
 build/package/Installer.RPM.targets           |  2 +-
 scripts/cli-test-env.sh                       |  0
 .../GivenAProjectToolsCommandResolver.cs      |  2 +-
 6 files changed, 3 insertions(+), 41 deletions(-)
 mode change 100644 => 100755 scripts/cli-test-env.sh

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 66f6f87a0..82d926e11 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -21,9 +21,6 @@
     <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
     <CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
-
-    <IsSharedFrameworkPreReleaseVersion>$([System.Text.RegularExpressions.Regex]::IsMatch($(SharedFrameworkVersion), '\d*\.\d*\.\d*-'))</IsSharedFrameworkPreReleaseVersion>
-    <SharedFrameworkStableVersion>$([System.Text.RegularExpressions.Regex]::Match($(SharedFrameworkVersion), '\d*\.\d*\.\d*').get_Groups().get_Item(0).ToString())</SharedFrameworkStableVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/Test.targets b/build/Test.targets
index 9f7bd0a47..388a2e1fe 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -35,35 +35,6 @@
       </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/$(CLI_SharedFrameworkVersion)/*.*"/>
-        <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
@@ -72,12 +43,6 @@
     </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"
diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index 63f7fcd45..c7bdd7682 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -97,7 +97,7 @@
   </Target>
 
   <Target Name="TestSdkDeb"
-      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
+      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
       DependsOnTargets="RestoreTests"
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 51217dde0..299ed9602 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -228,7 +228,7 @@
 
   <Target Name="TestSdkRpm"
           DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
+          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
           Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);
diff --git a/scripts/cli-test-env.sh b/scripts/cli-test-env.sh
old mode 100644
new mode 100755
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 6953067b6..4b5a3874b 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests
             var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
 
             result.Should().NotBeNull();
-            
+
             result.Args.Should().Contain("--fx-version 2.1.0");
         }