Skip to content

Commit

Permalink
[release/9.0.1xx-preview6] [dotnet] Fix workload reference to .NET 8 …
Browse files Browse the repository at this point in the history
…packages. (#20795)

The stable .NET 8 workload we're releasing is calling its Sdk pack
'Microsoft.iOS.Sdk.net8'. This means the pack has to be named the same
across
everything we're releasing, so special-case the Sdk pack in preview 6 to
use
the same Sdk pack name.

New WorkloadManifest.json:
https://gist.github.com/rolfbjarne/eeee0cee3c6cb328f7853dbe49ed0d50
Diff with previous one:
https://gist.github.com/rolfbjarne/f2c25d2956d39e380e4cc9f922083117
  • Loading branch information
rolfbjarne committed Jul 1, 2024
1 parent 76d9187 commit 4741d54
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion builds/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ print-dotnet-pkg-urls: dotnet-install.sh
$(Q) rm -f $@-found-it.stamp

dotnet-install.sh: Makefile
$(Q) $(CURL_RETRY) https://dot.net/v1/dotnet-install.sh --output $@.tmp
$(Q) $(CURL_RETRY) https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.sh --output $@.tmp
$(Q) chmod +x $@.tmp
$(Q) mv $@.tmp $@

Expand Down
8 changes: 4 additions & 4 deletions dotnet/generate-workloadmanifest-json.csharp
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
writer.WriteLine ($" \"description\": \".NET SDK Workload for building {platform} applications.\",");
writer.WriteLine ($" \"packs\": [");
foreach (var tfm in allApiVersions) {
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.{tfm}\",");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.{(tfm == "net8.0" ? "net8" : tfm)}\",");
}
if (hasWindows) {
foreach (var tfm in allApiVersions) {
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.{tfm}\",");
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.{(tfm == "net8.0" ? "net8" : tfm)}\",");
}
}
writer.WriteLine ($" \"Microsoft.{platform}.Ref.{currentApiVersion}\",");
Expand Down Expand Up @@ -90,7 +90,7 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
failed = true;
}
}
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.{tfm}\": {{");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.{(tfm == "net8.0" ? "net8" : tfm)}\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{apiVersion}\",");
if (tfm == "net8.0") {
Expand All @@ -100,7 +100,7 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
}
writer.WriteLine ($" }},");
if (hasWindows) {
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.{tfm}\": {{");
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.{(tfm == "net8.0" ? "net8" : tfm)}\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{apiVersion}\",");
writer.WriteLine ($" \"alias-to\": {{");
Expand Down
4 changes: 2 additions & 2 deletions dotnet/generate-workloadmanifest-targets.csharp
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ using (var writer = new StreamWriter (outputPath)) {
writer.WriteLine ($" <Import Project=\"Sdk.props\" Sdk=\"Microsoft.{platform}.Sdk.{workloadVersion}\" />");
} else {
writer.WriteLine ($" <ImportGroup Condition=\" '$(TargetPlatformIdentifier)' == '{platform}' And '$(UsingAppleNETSdk)' != 'true' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '{tfv}'))\">");
writer.WriteLine ($" <Import Project=\"Sdk.props\" Sdk=\"Microsoft.{platform}.Sdk.{workloadVersion}\" />");
writer.WriteLine ($" <Import Project=\"Sdk.props\" Sdk=\"Microsoft.{platform}.Sdk.{(workloadVersion == "net8.0" ? "net8" : tfm)}\" />");
}

if (hasWindows) {
writer.WriteLine ($" <Import Project=\"Sdk.props\" Sdk=\"Microsoft.{platform}.Windows.Sdk.Aliased.{workloadVersion}\" Condition=\" $([MSBuild]::IsOSPlatform('windows'))\" />");
writer.WriteLine ($" <Import Project=\"Sdk.props\" Sdk=\"Microsoft.{platform}.Windows.Sdk.Aliased.{(workloadVersion == "net8.0" ? "net8" : tfm)}\" Condition=\" $([MSBuild]::IsOSPlatform('windows'))\" />");
}

writer.WriteLine ($" </ImportGroup>");
Expand Down

8 comments on commit 4741d54

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ API diff for current PR / commit

NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

.NET (No breaking changes)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 [CI Build] Build failed 🔥

Build failed for the job 'Build macOS tests'

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

1 tests crashed, 0 tests failed, 60 tests passed.

Failures

❌ linker tests

🔥 Failed catastrophically on VSTS: test results - linker (no summary found).

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 1 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
⚠️ mac-binding-project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
✅ monotouch (iOS): All 7 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 7 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 4741d540eee2390fa075d0bdb49083cb58e43048 [CI build]

Please sign in to comment.