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

Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.

Browse source
This commit is contained in:
Livar Cunha 2017-10-06 11:08:02 -07:00
parent e6c0c6ef15
commit 36892f28e9
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/BundledRuntimes.props
View file

@ -21,6 +21,9 @@
<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
build/Test.targets
View file

@ -38,6 +38,35 @@
</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
@ -46,6 +75,12 @@
</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"

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

@ -95,7 +95,7 @@
</Target>
<Target Name="TestSdkDeb"
Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)' == 'true' "
Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)' == 'true' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
DependsOnTargets="RestoreTests"
Inputs="$(DownloadedSharedHostInstallerFile);
$(DownloadedHostFxrInstallerFile);