Making the cli-test-env shell script runnable and removing test workaround for preview runtimes. It is not needed in master.
This commit is contained in:
parent
d48654afe7
commit
d613ec5758
6 changed files with 3 additions and 41 deletions
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
0
scripts/cli-test-env.sh
Normal file → Executable file
0
scripts/cli-test-env.sh
Normal file → Executable file
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue