Skip to content

Conversation

@steveisok
Copy link
Member

In order to isolate the mauipre workload from 6.0 rtm, we need to make sure the manifest name contains the 200 band. This change modifies the msbuild property that controls the sdk band part of the name.

In order to isolate the mauipre workload from 6.0 rtm, we need to make sure the manifest name contains the 200 band.  This change modifies the msbuild property that controls the sdk band part of the name.
@ghost ghost assigned steveisok Dec 14, 2021
@ghost
Copy link

ghost commented Dec 14, 2021

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@marek-safar
Copy link
Contributor

@marcpopMSFT can you confirm this make sense?

jonathanpeppers added a commit to dotnet/android that referenced this pull request Dec 16, 2021
Changes: dotnet/installer@65bbb44...2dc0c5a

Updates: Microsoft.Dotnet.Sdk.Internal: from 6.0.102-servicing.21609.9 to 6.0.200-preview.21615.3

* No longer hardcode `$(DotNetPreviewVersionBand)` to 6.0.100
* Use 6.0.100 Mono workload packs until we get: dotnet/runtime#62787

Co-authored-by: Jonathan Peppers <[email protected]>
@ghost
Copy link

ghost commented Jan 4, 2022

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

In order to isolate the mauipre workload from 6.0 rtm, we need to make sure the manifest name contains the 200 band. This change modifies the msbuild property that controls the sdk band part of the name.

Author: steveisok
Assignees: steveisok
Labels:

area-Infrastructure

Milestone: -

@safern safern merged commit b96f560 into dotnet:release/6.0-maui Jan 4, 2022
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 5, 2022
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 5, 2022
Context: dotnet/runtime@37e3ee4...b96f560

Updates:
* Microsoft.NETCore.App.Ref: from 6.0.2-mauipre.1.21622.4 to 6.0.2-mauipre.1.22054.8

* [build] don't hardcode 6.0.100 for dotnet/runtime packs

Context: dotnet/runtime#62787

This partially reverts c457b1e.

Co-authored-by: Jonathan Peppers <[email protected]>
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 5, 2022
Context: dotnet/runtime@37e3ee4...b96f560

Updates:
* Microsoft.NETCore.App.Ref: from 6.0.2-mauipre.1.21622.4 to 6.0.2-mauipre.1.22054.8

* [build] don't hardcode 6.0.100 for dotnet/runtime packs

Context: dotnet/runtime#62787

This partially reverts c457b1e.

Co-authored-by: Jonathan Peppers <[email protected]>
jonathanpeppers added a commit to dotnet/maui that referenced this pull request Jan 6, 2022
jonathanpeppers added a commit to dotnet/maui that referenced this pull request Jan 6, 2022
steveisok pushed a commit to steveisok/runtime that referenced this pull request Jan 6, 2022
dotnet#62787 bumped the manifest id.  This change bumps the prop for testing.
jonathanpeppers added a commit to dotnet/maui that referenced this pull request Jan 6, 2022
* Update dependencies from https://github.com/xamarin/xamarin-android build main-05b7dbb2b4b9863793a4f41e8436514edba5f3b8-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.101-preview.12.163 -> To Version 31.0.101-preview.12.171

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100,Microsoft.NETCore.App.Ref,Microsoft.Extensions.Primitives,Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NETCore.App.Ref

* dotnet/runtime packs are not 6.0.100 anymore

Context: dotnet/runtime#62787

* emsdk still on 6.0.100

Co-authored-by: Jonathan Peppers <[email protected]>
Redth pushed a commit to dotnet/maui that referenced this pull request Jan 6, 2022
…android (#3964)

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.2xx-preview12-c0114c982361c94eefe100da965969ed2dd2e9bb-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.101-preview.12.163 -> To Version 31.0.200-preview.12.0

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100,Microsoft.Extensions.Primitives,Microsoft.Extensions.Hosting,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration.Binder,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.Configuration.CommandLine,Microsoft.Extensions.Configuration.EnvironmentVariables,Microsoft.Extensions.Configuration.FileExtensions,Microsoft.Extensions.Configuration.Json,Microsoft.Extensions.Configuration.UserSecrets,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Composite,Microsoft.Extensions.FileProviders.Physical,Microsoft.Extensions.FileSystemGlobbing,Microsoft.Extensions.Logging.Configuration,Microsoft.Extensions.Logging.EventLog,Microsoft.Extensions.Logging.EventSource,Microsoft.Extensions.Options,Microsoft.Extensions.Options.ConfigurationExtensions,System.CodeDom,System.Runtime.CompilerServices.Unsafe,System.Diagnostics.DiagnosticSource,System.Diagnostics.EventLog,System.IO.Pipelines,System.Text.Encodings.Web,System.Text.Json
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NETCore.App.Ref

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.2xx-preview12-c420be59b42d5b53bf8706dd3c56a0205b664e53-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.101-preview.12.163 -> To Version 31.0.200-preview.12.2

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100,Microsoft.NETCore.App.Ref,Microsoft.Extensions.Primitives,Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NETCore.App.Ref

* dotnet/runtime packs are not 6.0.100 anymore

Context: dotnet/runtime#62787

* emsdk still on 6.0.100

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <[email protected]>
safern pushed a commit that referenced this pull request Jan 7, 2022
* Bump SdkVersionForWorkloadTesting to use a 200 band SDK

#62787 bumped the manifest id.  This change bumps the prop for testing.

* Download dotnet-install script for installing workloads

Instead of trying to use the script from `.dotnet`, download the script.
`.dotnet` might not exist, for example, when the `global.json` version
matches the system installed one.

* Workloads: fix CI build when bumping to a newer version band

To resolve a workload, the current version band is used to look in
`sdk-manifests` directory. But when in development, and bumping to a
newer version band, not all the manifests might have packages for that.

This shows up when bumping the band to `6.0.200`, where we generate
the corresponding packages for wasm-tools. But the Emscripten packages
are still on `6.0.100`.

SDK [added](dotnet/sdk#19545) support for
falling back to older bands in that case.

The `InstallWorkloadFromArtifacts` task emits a warning about not being
able to find the emscripten manifest package. But this becomes an error
on CI due to warnaserror=true.

So, log a message instead of a warning. But this is only done for the
*dependent* manifest.

Co-authored-by: Steve Pfister <[email protected]>
Co-authored-by: Ankit Jain <[email protected]>
Redth added a commit to dotnet/maui that referenced this pull request Jan 7, 2022
…nging (#3994)

* iOS handle ctor is now NativeHandle not IntPtr

* [main] Update dependencies from xamarin/xamarin-android (#3974)

* Update dependencies from https://github.com/xamarin/xamarin-android build main-05b7dbb2b4b9863793a4f41e8436514edba5f3b8-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.101-preview.12.163 -> To Version 31.0.101-preview.12.171

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100,Microsoft.NETCore.App.Ref,Microsoft.Extensions.Primitives,Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NETCore.App.Ref

* dotnet/runtime packs are not 6.0.100 anymore

Context: dotnet/runtime#62787

* emsdk still on 6.0.100

Co-authored-by: Jonathan Peppers <[email protected]>

* More IntPtr -> NativeHandle

* Update GitInfo.txt

* Update variables.yml

* Update provision.yml

* Update MAUI Graphics version

* Add in auth token to the environment to prevent provisionator from hanging

* Update GitInfo.txt

* XCode 13.2

Co-authored-by: Redth <[email protected]>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <[email protected]>
Co-authored-by: Jonathan Dick <[email protected]>
@ghost ghost locked as resolved and limited conversation to collaborators Feb 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants