Skip to content

Allows usage of Web SDK when updating project files #2291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 1 commit into from
May 27, 2020
Merged

Allows usage of Web SDK when updating project files #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/GitVersionCore.Tests/VersionConverters/ProjectFileUpdaterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,25 @@ public void CanUpdateProjectFileWithStandardProjectFileXml(string xml)
canUpdate.ShouldBe(true);
}

[TestCase(@"
<Project Sdk=""Microsoft.NET.Sdk.Web"">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
</Project>
")]
[Category(NoMono)]
[Description(NoMonoDescription)]
public void CanUpdateProjectFileWithStandardWebProjectFileXml(string xml)
{
using var projectFileUpdater = new ProjectFileUpdater(log, fileSystem);

var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));

canUpdate.ShouldBe(true);
}

[TestCase(@"
<Project Sdk=""SomeOtherProject.Sdk"">
<PropertyGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/GitVersionCore/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,12 @@ internal bool CanUpdateProjectFile(XElement xmlRoot)
return false;
}

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

Expand Down