Skip to content

[workload] Fix the SDK band version and base the WBT on the sdk flow #107899

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

Closed
lewing wants to merge 17 commits into from
Closed

[workload] Fix the SDK band version and base the WBT on the sdk flow #107899

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bf3701a
Fix the workload band version
lewing Sep 16, 2024
78a563c
Fake the workload version suffix to something that will work in an rc…
lewing Sep 17, 2024
3b96f0c
Try 10.0.100-alpha.1 with a newer SDK
lewing Sep 17, 2024
5d81ca6
Merge branch 'main' into net10-manifests
lewing Sep 17, 2024
fe1126f
Create the manifest directory if it doesn't exist
lewing Sep 17, 2024
af433b4
Update src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
lewing Sep 17, 2024
40388cf
Update to a proper net10 emsdk
lewing Sep 18, 2024
5721b99
Add the emscripten dep back
lewing Sep 18, 2024
30604fa
Bump emsdk again
lewing Sep 18, 2024
852049e
Also install 9.0 to keep things working
lewing Sep 18, 2024
807f56c
Update the emsdk trigger too
lewing Sep 18, 2024
030d5d3
Update sdk refs
lewing Sep 18, 2024
a1166ce
Keep net8 too
lewing Sep 19, 2024
29926a3
Install aspnetcore runtime for downlevel too
lewing Sep 19, 2024
80d5bdc
Try with 10 here too
lewing Sep 19, 2024
c15da6c
Merge branch 'main' into net10-manifests
lewing Sep 20, 2024
e7f3b7b
Merge branch 'main' into net10-manifests
lewing Sep 24, 2024
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,14 @@
<Sha>08a167c19e5e04742b0922bdb1ea8046e9364f4b</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.2.24459.4">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.2.24467.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>8d10b56a313f40d3575133805ce4cff8f41e0ac6</Sha>
<Sha>899ea4114e44a50586b111dd3c4e338928f6508c</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.2.24459.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.2.24467.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>8d10b56a313f40d3575133805ce4cff8f41e0ac6</Sha>
<Sha>899ea4114e44a50586b111dd3c4e338928f6508c</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24409.2">
Expand Down
5 changes: 2 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<SdkBandVersion>9.0.100</SdkBandVersion>
<SdkBandVersion>$(MajorVersion).0.100</SdkBandVersion>
<PackageVersionNet8>8.0.8</PackageVersionNet8>
<PackageVersionNet7>7.0.20</PackageVersionNet7>
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25))</PackageVersionNet6>
Expand Down Expand Up @@ -254,8 +254,7 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- sdk version, for testing workloads -->
<!-- pin temporarily to work around sdk flow in net10 channel, must be >= global.json sdk version -->
<SdkVersionForWorkloadTesting>9.0.100-rc.1.24452.12</SdkVersionForWorkloadTesting>
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>
Expand Down
6 changes: 6 additions & 0 deletions src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v

string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name);

if (!Directory.Exists(outputDir))
{
Log.LogError($"Could not find {name} directory at {outputDir}. Creating it..");
Directory.CreateDirectory(outputDir);
}

// If we one sub entry, it's workload manifest version and we should install into it (aka workload sets)
string[] outputSubEntries = Directory.GetFileSystemEntries(outputDir);
if (outputSubEntries.Length == 1)
Expand Down