github/DotNetSolutionTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade single project and nuget lookup fix

Browse Source
This commit is contained in:
Matthew Parker [SSW]
2024-01-11 15:29:21 +10:00
parent 0c4bdfd5a8
commit 2f64270fb4
5 changed files with 128 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.csharpierrc
View File

@@ -1,3 +1,3 @@
{
"printWidth": 100
"printWidth": 120
}

45
DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs
View File

@@ -23,7 +23,7 @@ public partial class MainWindowViewModel : ViewModelBase
[ObservableProperty]
private ObservableCollection<string> _parityResults = new() { };
[ObservableProperty]
private string _resultsLabel = "Ready";
@@ -35,10 +35,7 @@ public partial class MainWindowViewModel : ViewModelBase
ResultsLabel = string.Empty;
try
{
var results = SolutionProjectParity.CompareSolutionAndCSharpProjects(
SolutionFolderPath,
SolutionFilePath
);
var results = SolutionProjectParity.CompareSolutionAndCSharpProjects(SolutionFolderPath, SolutionFilePath);
foreach (var result in results)
ParityResults.Add(result);
ResultsLabel = $"{results.Count} Projects in folder missing from solution";
@@ -62,9 +59,7 @@ public partial class MainWindowViewModel : ViewModelBase
ErrorMessages?.Clear();
try
{
var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder(
SolutionFolderPath
);
var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder(SolutionFolderPath);
foreach (var csproj in csprojList)
{
FormatCsproj.FormatCsprojFile(csproj);
@@ -83,9 +78,7 @@ public partial class MainWindowViewModel : ViewModelBase
ErrorMessages?.Clear();
try
{
var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder(
SolutionFolderPath
);
var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder(SolutionFolderPath);
foreach (var csproj in csprojList)
{
FormatCsproj.FormatCsprojFile(csproj);
@@ -97,7 +90,7 @@ public partial class MainWindowViewModel : ViewModelBase
ParityResults?.Add(e.Message);
}
}
[RelayCommand]
private async Task CheckForMissingImplicitUsingsInSolutionFile(CancellationToken token)
{
@@ -116,7 +109,7 @@ public partial class MainWindowViewModel : ViewModelBase
ParityResults?.Add(e.Message);
}
}
[RelayCommand]
private async Task CheckForMissingTreatWarningsAsErrorsInSolutionFile(CancellationToken token)
{
@@ -135,7 +128,7 @@ public partial class MainWindowViewModel : ViewModelBase
ParityResults?.Add(e.Message);
}
}
[RelayCommand]
private async Task DeleteBinAndObjFoldersInFolder(CancellationToken token)
{
@@ -153,7 +146,7 @@ public partial class MainWindowViewModel : ViewModelBase
ParityResults?.Add(e.Message);
}
}
[RelayCommand]
private async Task UpdateAllProjectsToNet80(CancellationToken token)
{
@@ -172,6 +165,24 @@ public partial class MainWindowViewModel : ViewModelBase
}
}
[RelayCommand]
private async Task UpdateProjectToNet80(CancellationToken token)
{
ErrorMessages?.Clear();
ParityResults.Clear();
ResultsLabel = string.Empty;
try
{
await DotNetUpgrade.UpdateProjectAtPathToNet80(CsprojFilePath);
ResultsLabel = "Successfully updated project to .NET 8";
}
catch (Exception e)
{
ResultsLabel = "Failed to update project to .NET 8";
ParityResults?.Add(e.Message);
}
}
[RelayCommand]
private async Task LoadSolutionFile(CancellationToken token)
{
@@ -264,7 +275,7 @@ public partial class MainWindowViewModel : ViewModelBase
var json = JsonSerializer.Serialize(dto);
await File.WriteAllTextAsync("./localState.json", json);
}
private async Task LoadSavedState()
{
try
@@ -284,7 +295,7 @@ public partial class MainWindowViewModel : ViewModelBase
// ignored
}
}
public MainWindowViewModel()
{
LoadSavedState().ConfigureAwait(false);

9
DotNetSolutionTools.App/Views/MainWindow.axaml
View File

@@ -107,6 +107,15 @@
Update all projects in Solution to .NET 8.0
</TextBlock>
</Button>
<Button Grid.Row="2" Grid.Column="2" MinHeight="100" Padding="10" Margin="5"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
IsEnabled="{Binding SolutionFilePath, Mode=OneWay, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
Command="{Binding UpdateProjectToNet80Command}">
<TextBlock TextWrapping="Wrap">
Update C# Project to .NET 8.0
</TextBlock>
</Button>
</Grid>
<Label HorizontalAlignment="Center" Name="ResultsLabel" Content="{Binding ResultsLabel}"></Label>
</StackPanel>

65
DotNetSolutionTools.Core/DotNetUpgrade.cs
View File

@@ -11,30 +11,39 @@ public static class DotNetUpgrade
public static async Task UpdateProjectsInSolutionToNet80(string solutionFilePath)
{
var solutionFile = SolutionFile.Parse(solutionFilePath);
var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(
solutionFile
);
var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(solutionFile);
await UpdateProjectsToNet80(csprojList);
}
public static async Task UpdateProjectAtPathToNet80(string csprojFilePath)
{
var csproj = ProjectRootElement.Open(csprojFilePath);
await UpdateProjectToNet80(csproj!);
}
private static async Task UpdateProjectsToNet80(List<ProjectRootElement> projects)
{
foreach (var project in projects)
{
var targetFramework = project
.PropertyGroups
.SelectMany(x => x.Properties)
.FirstOrDefault(x => x.Name == "TargetFramework");
if (targetFramework?.Value is "net8.0" or "net7.0" or "net6.0" or "net5.0")
await UpdateProjectToNet80(project);
}
}
private static async Task UpdateProjectToNet80(ProjectRootElement project)
{
var targetFramework = project
.PropertyGroups
.SelectMany(x => x.Properties)
.FirstOrDefault(x => x.Name == "TargetFramework");
if (targetFramework?.Value is "net8.0" or "net7.0" or "net6.0" or "net5.0")
{
if (targetFramework.Value is not "net8.0")
{
if (targetFramework.Value is not "net8.0")
{
targetFramework.Value = "net8.0";
project.Save();
FormatCsproj.FormatCsprojFile(project.FullPath);
}
await UpdatePackagesToLatest(project);
targetFramework.Value = "net8.0";
project.Save();
FormatCsproj.FormatCsprojFile(project.FullPath);
}
await UpdatePackagesToLatest(project);
}
}
@@ -47,10 +56,16 @@ public static class DotNetUpgrade
project,
new ProjectOptions() { LoadSettings = ProjectLoadSettings.IgnoreMissingImports }
);
var packages = evalProject.Items.Where(x =>
x.ItemType == "PackageReference" && x.HasMetadata("Version") &&
x.EvaluatedInclude.StartsWith("Microsoft.")).ToList();
var packages = evalProject
.Items
.Where(
x =>
x.ItemType == "PackageReference"
&& x.HasMetadata("Version")
&& x.EvaluatedInclude.StartsWith("Microsoft.")
)
.ToList();
var packageNameAndVersion = packages
.Select(
x =>
@@ -68,8 +83,11 @@ public static class DotNetUpgrade
var shouldSave = false;
foreach (var package in packageNameAndVersion)
{
var latestNugetVersion = await NugetLookup.FetchPackageMetadataAsync(package.Name);
var latestNugetVersion = await NugetLookup.FetchPackageMetadataAsync(
package.Name,
package.NugetVersion.IsPrerelease
);
if (latestNugetVersion > package.NugetVersion)
{
shouldSave = true;
@@ -83,6 +101,11 @@ public static class DotNetUpgrade
FormatCsproj.FormatCsprojFile(project.FullPath);
}
}
catch (Exception e)
{
Console.WriteLine(e);
throw;
}
finally
{
if (evalProject is not null)

54
DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs
View File

@@ -7,20 +7,58 @@ namespace DotNetSolutionTools.Core.Infrastructure;
public static class NugetLookup
{
public static async Task<NuGetVersion> FetchPackageMetadataAsync(string packageId)
public static async Task<NuGetVersion> FetchPackageMetadataAsync(string packageId, bool isCurrentlyPrerelease)
{
var cache = new SourceCacheContext();
var repositories = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
var logger = NullLogger.Instance;
var resource = await repositories.GetResourceAsync<FindPackageByIdResource>();
var versions = await resource.GetAllVersionsAsync(
packageId,
cache,
logger,
CancellationToken.None
);
var versions = await resource.GetAllVersionsAsync(packageId, cache, logger, CancellationToken.None);
return versions.Last(s => s.IsPrerelease == false);
var latestPrereleaseVersion = versions.LastOrDefault(s => s.IsPrerelease == true);
var latestStableVersion = versions.LastOrDefault(s => s.IsPrerelease == false);
if (latestStableVersion is null && latestPrereleaseVersion is null)
{
Throw(packageId);
}
if (latestStableVersion is null)
{
if (isCurrentlyPrerelease && latestPrereleaseVersion is not null)
{
return latestPrereleaseVersion;
}
else
{
Throw(packageId);
}
}
if (latestPrereleaseVersion is null)
{
return latestStableVersion;
}
if (latestStableVersion > latestPrereleaseVersion)
{
return latestStableVersion;
}
if (isCurrentlyPrerelease)
{
return latestPrereleaseVersion;
}
return latestStableVersion;
}
public static void Throw(string packageId)
{
throw new ArgumentNullException(
"latestVersion",
$"No latest stable or prerelease Nuget package version found for {packageId}"
);
}
}