Merge branch 'master' into RemoveStopMigrationOnMissingAreaIterationN…

…odes
nkdAgility · Nov 6, 2023 · 97712dc · 97712dc
2 parents d7d3184 + 0f81003
commit 97712dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/MigrationTools.Host/MigrationTools.Host.csproj b/src/MigrationTools.Host/MigrationTools.Host.csproj
@@ -24,7 +24,7 @@
  <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
  <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
- <PackageReference Include="WGet.NET" Version="3.1.0" />
+ <PackageReference Include="WGet.NET" Version="3.2.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/MigrationTools.Host/Services/DetectVersionService.cs b/src/MigrationTools.Host/Services/DetectVersionService.cs
@@ -37,11 +37,11 @@ public Version GetLatestVersion()
  try
  {
  WinGetPackageManager packageManager = new WinGetPackageManager();
- var package = packageManager.GetInstalledPackages(PackageId).GroupBy(e => e.Id, (id, g) => g.First()).SingleOrDefault();
+ var package = packageManager.GetInstalledPackages(PackageId, true).FirstOrDefault();
 
- latestPackageVersion = new Version(package.AvailableVersion);
- if (latestPackageVersion != null)
+ if (package != null)
  {
+ latestPackageVersion = package.AvailableVersionObject;
  sucess = true;
  }
  _Telemetry.TrackDependency(new DependencyTelemetry("PackageRepository", "winget", PackageId, latestPackageVersion == null ? "nullVersion" : latestPackageVersion.ToString(), startTime, mainTimer.Elapsed, "200", sucess));

diff --git a/src/MigrationTools.Host/Services/DetectVersionService2.cs b/src/MigrationTools.Host/Services/DetectVersionService2.cs
@@ -87,11 +87,11 @@ private void InitialiseService()
  if (IsPackageManagerInstalled)
  {
  Log.Verbose("Searching for package!");
- package = packageManager.GetInstalledPackages(PackageId).GroupBy(e => e.Id, (id, g) => g.First()).SingleOrDefault();
+ package = packageManager.GetInstalledPackages(PackageId, true).FirstOrDefault();
  if (package != null)
  {
- AvailableVersion = new Version(package.AvailableVersion);
- InstalledVersion = new Version(package.Version);
+ AvailableVersion = package.AvailableVersionObject;
+ InstalledVersion = package.VersionObject;
  Log.Debug("Found package with id {PackageId}", PackageId);
  IsPackageInstalled = true;
  }