Skip to content

Commit

Permalink
feat: Add support for new manifest format in 6.0.400
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeromelaban
jeromelaban committed Jun 17, 2022
1 parent 2d59360 commit d10189f
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 27 deletions.
8 changes: 4 additions & 4 deletions UnoCheck/AcquirePackagesCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ public override async Task<int> ExecuteAsync(CommandContext context, AcquirePack
var manifests = nugetWorkloadManifestProvider.GetManifests();
foreach (var mfst in manifests)
{
AnsiConsole.MarkupLine($"Acquiring packages for: {mfst.manifestId} ...");
AnsiConsole.MarkupLine($"Acquiring packages for: {mfst.ManifestId} ...");

var manifestReader = WorkloadManifestReader.ReadWorkloadManifest(mfst.manifestId, mfst.openManifestStream());
var manifestReader = WorkloadManifestReader.ReadWorkloadManifest(mfst.ManifestId, mfst.OpenManifestStream(), mfst.ManifestPath);

foreach (var wlPack in manifestReader.Packs)
{
Expand Down Expand Up @@ -310,8 +310,8 @@ public async Task ParseManifestPackages(string directory, List<Manifest.DotNetWo
public IEnumerable<string> GetManifestDirectories()
=> manifestDirs.Select(m => m.dir);

public IEnumerable<(string manifestId, string informationalPath, Func<Stream> openManifestStream, Func<Stream> openLocalizationStream)> GetManifests()
=> manifestDirs.Select(m => (m.id, m.dir, new Func<Stream>(() => File.OpenRead(m.file)), new Func<Stream>(() => null)));
public IEnumerable<ReadableWorkloadManifest> GetManifests()
=> manifestDirs.Select(m => new ReadableWorkloadManifest(m.id, m.dir, new Func<Stream>(() => File.OpenRead(m.file)), new Func<Stream>(() => null)));

public string GetSdkFeatureBand()
=> $"{SdkVersion.Major}.{SdkVersion.Minor}.{SdkVersion.Patch}";
Expand Down
4 changes: 3 additions & 1 deletion UnoCheck/Checkups/DotNetWorkloadsCheckup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ public override async Task<DiagnosticResult> Examine(SharedState history)

foreach (var rp in RequiredWorkloads.Where(w => w.SupportedPlatforms?.Contains(Util.Platform) ?? false))
{
if (!NuGetVersion.TryParse(rp.Version, out var rpVersion))
string version = rp.Version.Split("/", StringSplitOptions.None).FirstOrDefault();

if (!NuGetVersion.TryParse(version, out var rpVersion))
rpVersion = new NuGetVersion(0, 0, 0);

// TODO: Eventually check actual workload resolver api for installed workloads and
Expand Down
10 changes: 5 additions & 5 deletions UnoCheck/DotNet/DotNetWorkloadManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ Dictionary<string, string> GetInstalledWorkloadManifestIdsAndVersions()

foreach (var manifestInfo in manifestProvider.GetManifests())
{
using (var manifestStream = manifestInfo.openManifestStream())
using (var manifestStream = manifestInfo.OpenManifestStream())
{
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.manifestId, manifestStream);
items[manifestInfo.manifestId] = m.Version;
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.ManifestId, manifestStream, manifestInfo.ManifestPath);
items[manifestInfo.ManifestId] = m.Version;
}
}

Expand All @@ -112,9 +112,9 @@ Dictionary<string, string> GetInstalledWorkloadManifestIdsAndVersions()

foreach (var manifestInfo in manifestProvider.GetManifests())
{
using (var manifestStream = manifestInfo.openManifestStream())
using (var manifestStream = manifestInfo.OpenManifestStream())
{
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.manifestId, manifestStream);
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.ManifestId, manifestStream, manifestInfo.ManifestPath);

// Each workload manifest can have one or more workloads defined
foreach (var wl in m.Workloads)
Expand Down
4 changes: 2 additions & 2 deletions UnoCheck/DotNet/DotNetWorkloadManagerLegacy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ async Task DeleteExistingWorkloads(string sdkRoot, string sdkVersion, string wor

foreach (var manifestInfo in manifestProvider.GetManifests())
{
using (var manifestStream = manifestInfo.openManifestStream())
using (var manifestStream = manifestInfo.OpenManifestStream())
{
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.manifestId, manifestStream);
var m = WorkloadManifestReader.ReadWorkloadManifest(manifestInfo.ManifestId, manifestStream, manifestInfo.ManifestPath);

// Each workload manifest can have one or more workloads defined
foreach (var wl in m.Workloads)
Expand Down
3 changes: 1 addition & 2 deletions UnoCheck/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"profiles": {
"UnoCheck": {
"commandName": "Project",
"commandLineArgs": "--verbose --pre"
"commandLineArgs": "--verbose --manifest C:\\s\\unoplatform\\uno.check\\manifests\\uno.ui-preview.manifest.json"
},
"WSL 2": {
"commandName": "WSL2",
"environmentVariables": {},
"distributionName": ""
}
}
Expand Down
2 changes: 2 additions & 0 deletions UnoCheck/UnoCheck.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
<PackageReference Include="NuGet.Versioning" Version="5.10.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="vswhere" Version="2.8.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
26 changes: 13 additions & 13 deletions manifests/uno.ui-preview.manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"toolVersion": "1.2.0",
"variables": {
"OPENJDK_VERSION": "11.0.10.9",
"DOTNET_SDK_VERSION": "6.0.300",
"MACCATALYST_SDK_VERSION": "15.4.303",
"IOS_SDK_VERSION": "15.4.303",
"TVOS_SDK_VERSION": "15.4.303",
"MACOS_SDK_VERSION": "12.3.303",
"ANDROID_SDK_VERSION": "32.0.301",
"MONO_TOOLCHAIN_VERSION": "6.0.5"
"DOTNET_SDK_VERSION": "6.0.400-preview.22301.10",
"MACCATALYST_SDK_VERSION": "15.4.408/6.0.400",
"IOS_SDK_VERSION": "15.4.408/6.0.400",
"TVOS_SDK_VERSION": "15.4.408/6.0.400",
"MACOS_SDK_VERSION": "12.3.408/6.0.400",
"ANDROID_SDK_VERSION": "32.0.415/6.0.300",
"MONO_TOOLCHAIN_VERSION": "6.0.6/6.0.300"
},
"variableMappers": [
],
Expand All @@ -25,7 +25,7 @@
"exactVersionName": "13.3"
},
"vswin": {
"minimumVersion": "17.3.0-pre.1.0"
"minimumVersion": "17.3.0-pre.2.0"
},
"vsmac": {
"minimumVersion": "8.10.0",
Expand Down Expand Up @@ -109,28 +109,28 @@
{
"workloadId": "ios",
"workloadManifestId": "microsoft.net.sdk.ios",
"packageId": "Microsoft.NET.Sdk.iOS.Manifest-6.0.300",
"packageId": "Microsoft.NET.Sdk.iOS.Manifest-6.0.400",
"version": "$(IOS_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "maccatalyst",
"workloadManifestId": "microsoft.net.sdk.maccatalyst",
"packageId": "Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.300",
"packageId": "Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.400",
"version": "$(MACCATALYST_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "tvos",
"workloadManifestId": "microsoft.net.sdk.tvos",
"packageId": "Microsoft.NET.Sdk.tvOS.Manifest-6.0.300",
"packageId": "Microsoft.NET.Sdk.tvOS.Manifest-6.0.400",
"version": "$(TVOS_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "macos",
"workloadManifestId": "microsoft.net.sdk.macos",
"packageId": "Microsoft.NET.Sdk.macOS.Manifest-6.0.300",
"packageId": "Microsoft.NET.Sdk.macOS.Manifest-6.0.400",
"version": "$(MACOS_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
Expand Down Expand Up @@ -175,4 +175,4 @@
]
}
}
}
}

0 comments on commit d10189f

Please sign in to comment.