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

Merge pull request #9743 from johnbeisner/DisableTests2.2.1xx

Browse source 
Temporarily disable 3 tests; CLI:release/2.2.1xx
This commit is contained in:
John Beisner 2018-07-26 18:11:57 -07:00 • committed by GitHub
commit 421c17ff4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,11 +5,11 @@
<Import Project="Installer.DEB.targets" /> <Import Project="Installer.DEB.targets" />
<!-- Re-enable "TestSdkDeb" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
<Target Name="GenerateDebs" <Target Name="GenerateDebs"
DependsOnTargets="SetupDebProps; DependsOnTargets="SetupDebProps;
TestDebuild; TestDebuild;
BuildSdkDeb; BuildSdkDeb"
TestSdkDeb;"
Condition=" '$(IsDebianBaseDistro)' == 'True' " Condition=" '$(IsDebianBaseDistro)' == 'True' "
Outputs="@(GeneratedInstallers)"/> Outputs="@(GeneratedInstallers)"/>
@ -93,14 +93,16 @@
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" /> UseHardlinksIfPossible="False" />
<!-- Remove Shared Framework and Debian Packages --> <!-- Proactively remove all possible Shared Framework and Debian Packages -->
<!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 --> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageFileName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageFileName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(RuntimeDepsPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageFileName)" />
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
</Target> </Target>
<Target Name="TestSdkDeb" <Target Name="TestSdkDeb"
@ -130,13 +132,12 @@
ToolPath="$(DebianInstalledDirectory)" /> ToolPath="$(DebianInstalledDirectory)" />
<!-- Clean up Packages --> <!-- Clean up Packages -->
<!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 --> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
</Target> </Target>
<Target Name="PrepareDotnetDebDirectories"> <Target Name="PrepareDotnetDebDirectories">

17
build/package/Installer.DEB.targets
View file

@ -30,23 +30,16 @@
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxDebianPackageVersion> <SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxDebianPackageVersion>
<SharedFxDebianPackageFileName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageFileName> <SharedFxDebianPackageFileName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageFileName>
<SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName> <SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName>
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName> -->
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageName>
<SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName> <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
<HostFxrDebianPackageVersion>$(HostFxrMajorMinorVersion)</HostFxrDebianPackageVersion> <HostFxrDebianPackageFileName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageFileName>
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName> <HostFxrDebianPackageFileName>$(HostFxrDebianPackageFileName.ToLower())</HostFxrDebianPackageFileName>
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrMajorMinorVersion)</HostFxrDebianPackageName>
<HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName> <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
<HostDebianPackageName>dotnet-host</HostDebianPackageName> <HostDebianPackageName>dotnet-host</HostDebianPackageName>
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName> <AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName>
<AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName> <AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName>
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName> -->
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageName>
<AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName> <AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName>
</PropertyGroup> </PropertyGroup>

28
build/package/Installer.RPM.targets
View file

@ -9,8 +9,9 @@
<BuildRpmPackage Condition=" '$(IsRPMBasedDistro)' == 'True' ">True</BuildRpmPackage> <BuildRpmPackage Condition=" '$(IsRPMBasedDistro)' == 'True' ">True</BuildRpmPackage>
</PropertyGroup> </PropertyGroup>
<!-- Re-enable "TestSdkRpm" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
<Target Name="GenerateRpms" <Target Name="GenerateRpms"
DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm" DependsOnTargets="TestFPMTool;BuildRpms"
Condition=" '$(BuildRpmPackage)' == 'True' " Condition=" '$(BuildRpmPackage)' == 'True' "
Outputs="@(GeneratedInstallers)"/> Outputs="@(GeneratedInstallers)"/>
@ -172,11 +173,7 @@
<SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName> <SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
<SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion> <SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion>
<SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion> <SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion>
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName> -->
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageName>
<SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName> <SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName>
<SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName> <SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName>
<SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName> <SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName>
@ -184,11 +181,7 @@
<HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName> <HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
<HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName> <HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
<HostRpmPackageName>dotnet-host</HostRpmPackageName> <HostRpmPackageName>dotnet-host</HostRpmPackageName>
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName> -->
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageName>
<AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName> <AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName>
<AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName> <AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName>
<AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName> <AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName>
@ -249,12 +242,11 @@
ToolPath="$(RpmInstalledDirectory)" /> ToolPath="$(RpmInstalledDirectory)" />
<!-- Clean up Packages --> <!-- Clean up Packages -->
<!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 --> <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(SdkRpmPackageName)" /> <Exec Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" /> <Exec Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" /> <Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(HostFxrRpmPackageName)" /> <Exec Command="sudo yum remove -y $(HostRpmPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(HostRpmPackageName)" /> <Exec Command="sudo yum remove -y $(RuntimeDepsPackageFileName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(RuntimeDepsPackageFileName)" />
</Target> </Target>
</Project> </Project>

3
test/dotnet.Tests/CommandTests/CompleteCommandTests.cs
View file

@ -73,10 +73,11 @@ namespace Microsoft.DotNet.Tests.Commands
reporter.Lines.Should().Equal(expected.OrderBy(c => c)); reporter.Lines.Should().Equal(expected.OrderBy(c => c));
} }
[Fact] [Fact(Skip = "https://github.com/dotnet/cli/issues/9737")]
public void GivenNewCommandItDisplaysCompletions() public void GivenNewCommandItDisplaysCompletions()
{ {
var expected = new string[] { var expected = new string[] {
"--dry-run",
"--force", "--force",
"--help", "--help",
"--install", "--install",