Merge pull request #2202 from peterhuene/remove-windows-desktop-project-templates
Remove Windows Desktop project templates for non-Windows.
This commit is contained in:
commit
db69c4f0c6
3 changed files with 53 additions and 0 deletions
|
@ -26,6 +26,11 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="LayoutTemplates" DependsOnTargets="SetupBundledComponents">
|
<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)"
|
<Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
|
||||||
DestinationFolder="$(SdkOutputDirectory)Templates/"/>
|
DestinationFolder="$(SdkOutputDirectory)Templates/"/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
29
test/EndToEnd/GivenUnixPlatform.cs
Normal file
29
test/EndToEnd/GivenUnixPlatform.cs
Normal 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}.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -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";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue