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

Remove Windows Desktop project templates for non-Windows.

Browse source 
This commit removes the Windows Desktop project templates for non-Windows
builds of the .NET Core SDK.

Fixes dotnet/cli#11425.
This commit is contained in:
Peter Huene 2019-05-29 17:45:45 -07:00
parent 1a84964e28
commit 33815f75c9
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
3 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/redist/targets/BundledTemplates.targets
View file

@ -26,6 +26,11 @@
</ItemGroup>
<Target Name="LayoutTemplates" DependsOnTargets="SetupBundledComponents">
<ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
<BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
<BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
</ItemGroup>
<Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
DestinationFolder="$(SdkOutputDirectory)Templates/"/>
</Target>

29
test/EndToEnd/GivenUnixPlatform.cs Normal file
View file

@ -0,0 +1,29 @@
using System;
using System.IO;
using System.Linq;
using System.Xml.Linq;
using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit;
namespace EndToEnd.Tests
{
public class GivenUnixPlatform : TestBase
{
[UnixOnlyTheory]
[InlineData("wpf")]
[InlineData("winforms")]
public void ItDoesNotIncludeWindowsOnlyProjectTemplates(string template)
{
var directory = TestAssets.CreateTestDirectory();
new NewCommandShim()
.WithWorkingDirectory(directory.FullName)
.Execute(template)
.Should()
.Fail()
.And
.HaveStdErrContaining($": {template}.");
}
}
}

19
test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs Normal file
View file

@ -0,0 +1,19 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.PlatformAbstractions;
using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities
{
public class UnixOnlyTheoryAttribute : TheoryAttribute
{
public UnixOnlyTheoryAttribute()
{
if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
{
this.Skip = "This test requires Unix to run";
}
}
}
}