Skip to content
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

Jump to bottom

[workloads] Add Current to the name of the workload manifest #80401

Merged
merged 13 commits into from
Jan 28, 2023
Merged

[workloads] Add Current to the name of the workload manifest #80401

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c717c2e
[workloads] Add Current to the name of the workload manifest
Jan 9, 2023
cd3a6f4
Current was in the wrong spot. Moving it to the right place.
Jan 10, 2023
f7843db
Add current to shorname
Jan 10, 2023
341a0b3
Merge remote-tracking branch 'upstream/main' into rename-current-mani…
Jan 26, 2023
60042f7
Add prerelease label to manifest name
Jan 26, 2023
e3ffb5d
Add wildcard to support prerelease tagging
Jan 26, 2023
bbd3d01
Merge remote-tracking branch 'upstream/main' into rename-current-mani…
Jan 26, 2023
648f929
Alter emsdk dependency since the name changed
Jan 26, 2023
cb684f3
Use the sdkbandVersion with the prerelease suffix when installing wor…
radical Jan 26, 2023
2fd2ee4
[wasm] Update emsdk manifest to alpha.1
radical Jan 27, 2023
8e115c3
InstallWorkloadFromArtifacts: Add workarounds for the manifest name
radical Jan 27, 2023
4df4c0b
Fix name in extends for wasm-tools
Jan 27, 2023
a612c3b
[wasm] Bump emscripten manifest version to pick up the latest fixes
radical Jan 27, 2023
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
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<PackageVersionNet7>7.0.0</PackageVersionNet7>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
Copy link
Member

Choose a reason for hiding this comment

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

Should this be changing to preview too?

<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<WorkloadVersionSuffix Condition="'$(PreReleaseVersionLabel)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/evaluate-default-paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
- src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/*
- src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/*
- src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/*
- src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/*
- src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/*
- src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/*
- src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/*
- src/mono/nuget/Microsoft.NETCore.BrowserDebugHost.Transport/*
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/mono/templates/workloads-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvos-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvossimulator-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
Expand Down
2 changes: 1 addition & 1 deletion eng/testing/tests.wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
<Target Name="_GetWorkloadsToInstall" DependsOnTargets="_SetPackageVersionForWorkloadsTesting" Returns="@(WorkloadIdForTesting);@(WorkloadCombinationsToInstall)">
<ItemGroup>
<WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.Current"
Variant="latest"
Version="$(PackageVersionForWorkloadManifests)"
VersionBand="$(SdkBandVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion ....Workload.Mono.Toolchain.Manifest.pkgproj → ...d.Mono.Toolchain.Current.Manifest.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
<!-- Override the id to include the sdk band as per the workload installer spec -->
<PropertyGroup>
<Id>Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(SdkBandVersion)</Id>
<Id>Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-$(SdkBandVersion)$(WorkloadVersionSuffix)</Id>
</PropertyGroup>

<PropertyGroup>
Expand Down
0 ...olchain.Manifest/WorkloadManifest.json.in → ...Current.Manifest/WorkloadManifest.json.in
View file
Open in desktop
File renamed without changes.
0 ...hain.Manifest/WorkloadManifest.targets.in → ...rent.Manifest/WorkloadManifest.targets.in
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.cs.json → ...anifest/localize/WorkloadManifest.cs.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.de.json → ...anifest/localize/WorkloadManifest.de.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.en.json → ...anifest/localize/WorkloadManifest.en.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.es.json → ...anifest/localize/WorkloadManifest.es.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.fr.json → ...anifest/localize/WorkloadManifest.fr.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.it.json → ...anifest/localize/WorkloadManifest.it.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.ja.json → ...anifest/localize/WorkloadManifest.ja.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.ko.json → ...anifest/localize/WorkloadManifest.ko.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.pl.json → ...anifest/localize/WorkloadManifest.pl.json
View file
Open in desktop
File renamed without changes.
0 ...fest/localize/WorkloadManifest.pt-BR.json → ...fest/localize/WorkloadManifest.pt-BR.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.ru.json → ...anifest/localize/WorkloadManifest.ru.json
View file
Open in desktop
File renamed without changes.
0 ...anifest/localize/WorkloadManifest.tr.json → ...anifest/localize/WorkloadManifest.tr.json
View file
Open in desktop
File renamed without changes.
0 ...st/localize/WorkloadManifest.zh-Hans.json → ...st/localize/WorkloadManifest.zh-Hans.json
View file
Open in desktop
File renamed without changes.
0 ...st/localize/WorkloadManifest.zh-Hant.json → ...st/localize/WorkloadManifest.zh-Hant.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ....Mono.Toolchain.net6.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
<!-- Override the id to include the sdk band as per the workload installer spec -->
<PropertyGroup>
<Id>Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(SdkBandVersion)</Id>
<Id>Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(SdkBandVersion)$(WorkloadVersionSuffix)</Id>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ....Mono.Toolchain.net7.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
<!-- Override the id to include the sdk band as per the workload installer spec -->
<PropertyGroup>
<Id>Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(SdkBandVersion)</Id>
<Id>Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(SdkBandVersion)$(WorkloadVersionSuffix)</Id>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/nuget/mono-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetsMobile)' == 'true' or '$(ForceBuildMobileManifests)' == 'true'">
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.Manifest\Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj" />
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest\Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj" />
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest\Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest.pkgproj" />
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest\Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest.pkgproj" />
<ProjectReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task\Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Bumping Emscripten version involves these steps:
* bump docker images in https://github.com/dotnet/icu, update emscripten files in eng/patches/
* update version number in docs
* update `Microsoft.NET.Runtime.Emscripten.<emscripten version>.Node.win-x64` package name, version and sha hash in https://github.com/dotnet/runtime/blob/main/eng/Version.Details.xml and in https://github.com/dotnet/runtime/blob/main/eng/Versions.props. the sha is the commit hash in https://github.com/dotnet/emsdk and the package version can be found at https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet6
* update packages in the workload manifest https://github.com/dotnet/runtime/blob/main/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
* update packages in the workload manifest https://github.com/dotnet/runtime/blob/main/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in

## Upgrading NPM packages

Expand Down
4 changes: 2 additions & 2 deletions src/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project DefaultTargets="Restore;Build">
<Project DefaultTargets="Restore;Build">
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

<PropertyGroup>
Expand Down Expand Up @@ -124,7 +124,7 @@
<ShortNames Include="Microsoft.NET.Workload.Mono.ToolChain.net">
<Replacement>Mono.</Replacement>
</ShortNames>
<ShortNames Include="Microsoft.NET.Workload.Mono.ToolChain.">
<ShortNames Include="Microsoft.NET.Workload.Mono.ToolChain.Current.">
<Replacement>Mono.</Replacement>
</ShortNames>
<ShortNames Include="microsoft.netcore.app.runtime;Microsoft.NETCore.App.Runtime;microsoft.net.runtime;Microsoft.NET.Runtime">
Expand Down