This repository has been archived by the owner on May 17, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #262 from jmarolf/feature/discover-supported-tfms
Programatically determine highest tfm
- Loading branch information
Showing
16 changed files
with
156 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/MSBuild.Conversion.Project/MSBuild.Conversion.Project.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" /> | ||
| <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.IO.Compression; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| using Microsoft.Build.Locator; | ||
|
|
||
| using NuGet.Versioning; | ||
|
|
||
| namespace MSBuild.Conversion.SDK | ||
| { | ||
| public static class TargetFrameworkHelper | ||
| { | ||
| /// <summary> | ||
| /// Determine the TFM to use based on what is installed on the users machine | ||
| /// </summary> | ||
| public static string FindHighestInstalledTargetFramework(bool usePreviewSDK) | ||
| { | ||
| // Finds SDK path | ||
| string sdkPath = null; | ||
| try | ||
| { | ||
| sdkPath = Path.GetFullPath(Path.Combine(MSBuildLocator.QueryVisualStudioInstances().Single().VisualStudioRootPath, "..", "..")); | ||
| } | ||
| catch (Exception) | ||
| { | ||
| Console.WriteLine("Unable to find the .NET SDK on this machine, manually pass '-tfm'"); | ||
| throw; | ||
| } | ||
|
|
||
| try | ||
| { | ||
| // Find templates path | ||
| var templatesPath = Path.Combine(sdkPath, "templates"); | ||
|
|
||
| // Find highest SDK path (should include previews?) | ||
| var largestVersion = NuGetVersion.Parse("0.0.0.0"); | ||
| var templatePath = string.Empty; | ||
| foreach (var templateDirectory in Directory.EnumerateDirectories(templatesPath)) | ||
| { | ||
| if (NuGetVersion.TryParse(Path.GetFileName(templateDirectory), out var templatesVersion) && | ||
| templatesVersion > largestVersion) | ||
| { | ||
| if (usePreviewSDK) | ||
| { | ||
| largestVersion = templatesVersion; | ||
| templatePath = Path.GetFullPath(templateDirectory); | ||
| } | ||
| else if (!templatesVersion.IsPrerelease) | ||
| { | ||
| largestVersion = templatesVersion; | ||
| templatePath = Path.GetFullPath(templateDirectory); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // upzip the common project templates into memory | ||
| var templateNugetPackagePath = Directory.EnumerateFiles(templatePath, "microsoft.dotnet.common.projecttemplates.*.nupkg", SearchOption.TopDirectoryOnly).Single(); | ||
| using var templateNugetPackageFile = File.OpenRead(templateNugetPackagePath); | ||
| using var templateNugetPackage = new ZipArchive(templateNugetPackageFile, ZipArchiveMode.Read); | ||
| var templatesJsonFile = templateNugetPackage.Entries | ||
| .Where(x => x.Name.Equals("template.json", StringComparison.OrdinalIgnoreCase) && | ||
| x.FullName.Contains("ClassLibrary-CSharp", StringComparison.OrdinalIgnoreCase)).Single(); | ||
| using var templatesJson = templatesJsonFile.Open(); | ||
|
|
||
| // read the template.json file to see what the tfm is called | ||
| var doc = JsonDocument.ParseAsync(templatesJson).GetAwaiter().GetResult(); | ||
|
|
||
| return doc.RootElement.GetProperty("baselines").GetProperty("app").GetProperty("defaultOverrides").GetProperty("Framework").GetString(); | ||
| } | ||
| catch (Exception) | ||
| { | ||
| return "netcoreapp3.1"; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| /// <summary> | ||
| /// Regect obviously wrong TFM specifiers | ||
| /// </summary> | ||
| public static bool IsValidTargetFramework(string tfm) | ||
| => !tfm.Contains("-") && !tfm.Contains(" ") && tfm.Contains("net") && Regex.Match(tfm, "[0-9]").Success; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/PackageConversion.Tests/PackageConversion.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/ProjectConversion.Tests/ProjectConversion.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters