Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
This commit is contained in:
parent
e6c0c6ef15
commit
36892f28e9
3 changed files with 39 additions and 1 deletions
|
@ -21,6 +21,9 @@
|
||||||
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
|
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
|
||||||
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
|
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
|
||||||
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
<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>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -38,6 +38,35 @@
|
||||||
</ProjectsToTest>
|
</ProjectsToTest>
|
||||||
</ItemGroup>
|
</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" />
|
<Message Text="Starting test execution" Importance="High" />
|
||||||
|
|
||||||
<MSBuild
|
<MSBuild
|
||||||
|
@ -46,6 +75,12 @@
|
||||||
</MSBuild>
|
</MSBuild>
|
||||||
|
|
||||||
<Message Text="Finished test execution" Importance="High" />
|
<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>
|
||||||
|
|
||||||
<Target Name="PrepareTests"
|
<Target Name="PrepareTests"
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="TestSdkDeb"
|
<Target Name="TestSdkDeb"
|
||||||
Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)' == 'true' "
|
Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)' == 'true' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
|
||||||
DependsOnTargets="RestoreTests"
|
DependsOnTargets="RestoreTests"
|
||||||
Inputs="$(DownloadedSharedHostInstallerFile);
|
Inputs="$(DownloadedSharedHostInstallerFile);
|
||||||
$(DownloadedHostFxrInstallerFile);
|
$(DownloadedHostFxrInstallerFile);
|
||||||
|
|
Loading…
Reference in a new issue