Skip to content

Commit 12a2baa

Browse files
authored
Merge pull request #2291 from svengeance/feature/WebSdkInProjectFiles
Allows usage of Web SDK when updating project files
2 parents 791f284 + a421059 commit 12a2baa

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

src/GitVersionCore.Tests/VersionConverters/ProjectFileUpdaterTests.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,25 @@ public void CanUpdateProjectFileWithStandardProjectFileXml(string xml)
5252
canUpdate.ShouldBe(true);
5353
}
5454

55+
[TestCase(@"
56+
<Project Sdk=""Microsoft.NET.Sdk.Web"">
57+
<PropertyGroup>
58+
<OutputType>Exe</OutputType>
59+
<TargetFramework>netcoreapp3.1</TargetFramework>
60+
</PropertyGroup>
61+
</Project>
62+
")]
63+
[Category(NoMono)]
64+
[Description(NoMonoDescription)]
65+
public void CanUpdateProjectFileWithStandardWebProjectFileXml(string xml)
66+
{
67+
using var projectFileUpdater = new ProjectFileUpdater(log, fileSystem);
68+
69+
var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
70+
71+
canUpdate.ShouldBe(true);
72+
}
73+
5574
[TestCase(@"
5675
<Project Sdk=""SomeOtherProject.Sdk"">
5776
<PropertyGroup>

src/GitVersionCore/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@ internal bool CanUpdateProjectFile(XElement xmlRoot)
102102
return false;
103103
}
104104

105-
var supportedSdk = "Microsoft.NET.Sdk";
105+
var supportedSdks = new[] { "Microsoft.NET.Sdk", "Microsoft.NET.Sdk.Web" };
106106
var sdkAttribute = xmlRoot.Attribute("Sdk");
107-
if (sdkAttribute == null || sdkAttribute.Value != supportedSdk)
107+
if (sdkAttribute == null || !supportedSdks.Contains(sdkAttribute.Value))
108108
{
109-
log.Warning($"Specified project file Sdk ({sdkAttribute?.Value}) is not supported, please ensure the project sdk is {supportedSdk}.");
109+
var supportedSdkString = string.Join("|", supportedSdks);
110+
log.Warning($"Specified project file Sdk ({sdkAttribute?.Value}) is not supported, please ensure the project sdk is of the following: {supportedSdkString}.");
110111
return false;
111112
}
112113

0 commit comments

Comments
 (0)