[CI] Fix the generated rollback files. #14127
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As it is right now the generated rollback files look like the following
```json
{
"microsoft.net.sdk.android": "34.0.0-preview.2.187/8.0.100-preview.2",
"microsoft.net.sdk.ios": "16.2.379-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.maccatalyst": "16.2.379-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.macos": "13.1.379-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.maui": "8.0.0-preview.2.5602/8.0.100-preview.2",
"microsoft.net.sdk.tvos": "16.1.1167-net8-p2/8.0.100-preview.2",
"microsoft.net.workload.mono.toolchain.net6": "8.0.0-preview.2.23128.3/8.0.100-preview.2",
"microsoft.net.workload.mono.toolchain.net7": "8.0.0-preview.2.23128.3/8.0.100-preview.2",
"microsoft.net.workload.emscripten.net6": "8.0.0-preview.2.23127.1/8.0.100-preview.2",
"microsoft.net.workload.emscripten.net7": "8.0.0-preview.2.23127.1/8.0.100-preview.2"
}
```
While they should look like the following to be able to be used for
dogfooding.
```json
{
"microsoft.net.sdk.android": "34.0.0-preview.2.181/8.0.100-preview.2",
"microsoft.net.sdk.ios": "16.2.367-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.maccatalyst": "16.2.367-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.macos": "13.1.367-net8-p2/8.0.100-preview.2",
"microsoft.net.sdk.maui": "8.0.0-preview.2.7832/8.0.100-preview.2",
"microsoft.net.sdk.tvos": "16.1.1155-net8-p2/8.0.100-preview.2",
"microsoft.net.workload.mono.toolchain.net7": "8.0.0-preview.2.23127.2/8.0.100-preview.2",
"microsoft.net.workload.mono.toolchain.current": "8.0.0-preview.2.23127.2/8.0.100-preview.2",
"microsoft.net.workload.emscripten.net7": "8.0.0-preview.2.23127.1/8.0.100-preview.2",
"microsoft.net.workload.emscripten.current": "8.0.0-preview.2.23127.1/8.0.100-preview.2"
}
```
|
I probably need this to be back ported to preview2 and preview 3 (I am using preview 2 to test the mega pipeline). |
Comment on lines
10
to
11
| "microsoft.net.workload.emscripten.net6": "@MicrosoftNETWorkloadEmscriptenPackageVersion@/@DotNetEmscriptenManifestVersionBand@", | ||
| "microsoft.net.workload.emscripten.net7": "@MicrosoftNETWorkloadEmscriptenPackageVersion@/@DotNetEmscriptenManifestVersionBand@" |
There was a problem hiding this comment.
If you download a recent build:
https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x64.zip
I think all of these should be listed:
> 7z l dotnet-sdk-8.0.100-preview.4.23172.3-win-x64.zip | grep WorkloadManifest.json
2023-03-11 20:18:32 ..... 3022 457 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.android\WorkloadManifest.json
2023-03-08 17:33:46 ..... 2456 412 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.ios\WorkloadManifest.json
2023-03-08 17:33:46 ..... 1597 346 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.maccatalyst\WorkloadManifest.json
2023-03-08 17:33:46 ..... 1448 344 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.macos\WorkloadManifest.json
2023-03-09 12:37:16 ..... 4085 638 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.maui\WorkloadManifest.json
2023-03-08 17:33:46 ..... 1596 351 sdk-manifests\8.0.100-preview.2\microsoft.net.sdk.tvos\WorkloadManifest.json
2023-03-17 09:11:12 ..... 2624 409 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.emscripten.current\WorkloadManifest.json
2023-03-17 09:11:12 ..... 2010 384 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.emscripten.net6\WorkloadManifest.json
2023-03-17 09:11:12 ..... 2597 418 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.emscripten.net7\WorkloadManifest.json
2023-03-21 16:30:04 ..... 16167 1356 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.mono.toolchain.current\WorkloadManifest.json
2023-03-21 16:30:04 ..... 17494 1315 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.mono.toolchain.net6\WorkloadManifest.json
2023-03-21 16:30:04 ..... 18599 1407 sdk-manifests\8.0.100-preview.3\microsoft.net.workload.mono.toolchain.net7\WorkloadManifest.json
So, we end up with 3 entries for Mono & 3 for emscripten?
There was a problem hiding this comment.
Wait, I made a mistake, I ignored the microsoft.net.workload.emscripten.net7, I'll push a change for that.
mattleibow
approved these changes
Mar 22, 2023
jonathanpeppers
approved these changes
Mar 22, 2023
Eilon
added
the
area-infrastructure
|
/backport to release/8.0.1xx-preview2 |
|
Started backporting to release/8.0.1xx-preview2: https://github.com/dotnet/maui/actions/runs/4493218267 |
mandel-macaque
added a commit
that referenced
this pull request
Mar 22, 2023
…4141) Backport of #14127 to release/8.0.1xx-preview2 /cc @mandel-macaque
samhouts
added
the
fixed-in-8.0.0-preview.3.8149
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As it is right now the generated rollback files look like the following
{ "microsoft.net.sdk.android": "34.0.0-preview.2.187/8.0.100-preview.2", "microsoft.net.sdk.ios": "16.2.379-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.maccatalyst": "16.2.379-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.macos": "13.1.379-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.maui": "8.0.0-preview.2.5602/8.0.100-preview.2", "microsoft.net.sdk.tvos": "16.1.1167-net8-p2/8.0.100-preview.2", "microsoft.net.workload.mono.toolchain.net6": "8.0.0-preview.2.23128.3/8.0.100-preview.2", "microsoft.net.workload.mono.toolchain.net7": "8.0.0-preview.2.23128.3/8.0.100-preview.2", "microsoft.net.workload.emscripten.net6": "8.0.0-preview.2.23127.1/8.0.100-preview.2", "microsoft.net.workload.emscripten.net7": "8.0.0-preview.2.23127.1/8.0.100-preview.2" }While they should look like the following to be able to be used for dogfooding.
{ "microsoft.net.sdk.android": "34.0.0-preview.2.181/8.0.100-preview.2", "microsoft.net.sdk.ios": "16.2.367-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.maccatalyst": "16.2.367-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.macos": "13.1.367-net8-p2/8.0.100-preview.2", "microsoft.net.sdk.maui": "8.0.0-preview.2.7832/8.0.100-preview.2", "microsoft.net.sdk.tvos": "16.1.1155-net8-p2/8.0.100-preview.2", "microsoft.net.workload.mono.toolchain.net7": "8.0.0-preview.2.23127.2/8.0.100-preview.2", "microsoft.net.workload.mono.toolchain.current": "8.0.0-preview.2.23127.2/8.0.100-preview.2", "microsoft.net.workload.emscripten.net7": "8.0.0-preview.2.23127.1/8.0.100-preview.2", "microsoft.net.workload.emscripten.current": "8.0.0-preview.2.23127.1/8.0.100-preview.2" }