Skip to content

Commit 4a71530

Browse files
jonathanpeppersjonathanpeppers
authored
Merge branch 'main' into dev/grendel/test-runtimes-13
2 parents f802ad8 + bb2c376 commit 4a71530

File tree

21 files changed

+336
-176
lines changed

21 files changed

+336
-176
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
2828
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
2929
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
30-
<!-- Setting TargetsCurrent=true is necessary until we get https://github.com/dotnet/sdk/pull/52031 -->
31-
<!-- Ref: https://github.com/dotnet/macios/issues/24418 -->
32-
<TargetsCurrent>true</TargetsCurrent>
3330
</PropertyGroup>
3431

3532
<PropertyGroup>

‎build-tools/create-packs/Microsoft.Android.Sdk.proj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ core workload SDK packs imported by WorkloadManifest.targets.
1111
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
1212
<UsingTask AssemblyFile="$(BootstrapTasksAssembly)" TaskName="Xamarin.Android.Tools.BootstrapTasks.GenerateUnixFilePermissions" />
1313

14+
<PropertyGroup>
15+
<!-- Use stable TFM since CI only has the stable .NET SDK installed -->
16+
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
17+
</PropertyGroup>
18+
1419
<PropertyGroup>
1520
<PackageId>Microsoft.Android.Sdk.$(HostOS)</PackageId>
1621
<OverridePackageId>$(PackageId)</OverridePackageId>

‎build-tools/enumification-helpers/methodmap.ext.csv‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,9 @@
900900
19, android.nfc, NfcAdapter, enableReaderMode, flags, Android.Nfc.NfcReaderFlags
901901
19, android.print, PrintAttributes, getColorMode, return, Android.Print.PrintColorMode
902902
19, android.print, PrintAttributes.Builder, setColorMode, colorMode, Android.Print.PrintColorMode
903+
23, android.print, PrinterCapabilitiesInfo.Builder, setColorModes, colorModes, Android.Print.PrintColorMode
904+
23, android.print, PrinterCapabilitiesInfo.Builder, setColorModes, defaultColorMode, Android.Print.PrintColorMode
905+
23, android.print, PrinterCapabilitiesInfo, getColorModes, return, Android.Print.PrintColorMode
903906
19, android.print, PrintDocumentInfo, getContentType, return, Android.Print.PrintContentType
904907
19, android.print, PrintDocumentInfo.Builder, setContentType, type, Android.Print.PrintContentType
905908
19, android.print, PrintJobInfo, getState, return, Android.Print.PrintJobState

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class LinuxArch : Linux
2929
new ArchLinuxProgram ("make"),
3030
new ArchLinuxProgram ("patch"),
3131
new ArchLinuxProgram ("pkg-config"),
32-
new ArchLinuxProgram ("referenceassemblies-pcl"),
3332
new ArchLinuxProgram ("sed"),
3433
new ArchLinuxProgram ("texinfo"),
3534
new ArchLinuxProgram ("unzip"),

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class LinuxFedora : Linux
2929
new FedoraLinuxProgram ("make"),
3030
new FedoraLinuxProgram ("patch"),
3131
new FedoraLinuxProgram ("pkgconf"),
32-
new FedoraLinuxProgram ("referenceassemblies-pcl"),
3332
new FedoraLinuxProgram ("sed"),
3433
new FedoraLinuxProgram ("texinfo"),
3534
new FedoraLinuxProgram ("unzip"),

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.26060.102">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.26064.107">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
5+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.26060.102">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.26064.107">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
9+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26060.102">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26064.107">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
13+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26060.102">
15+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26064.107">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
17+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-alpha.1" Version="11.0.0-alpha.1.26060.102">
19+
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-alpha.1" Version="11.0.0-alpha.1.26064.107">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
21+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-alpha.1" Version="11.0.100-alpha.1.26060.102">
23+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-alpha.1" Version="11.0.100-alpha.1.26064.107">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
25+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
2626
</Dependency>
2727
<!-- Previous .NET version -->
2828
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.12">
@@ -36,13 +36,13 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26060.102">
39+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26064.107">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
41+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.26060.102">
43+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.26064.107">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
45+
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
4646
</Dependency>
4747
</ToolsetDependencies>
4848
</Dependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.26060.102</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.26064.107</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.26060.102</MicrosoftNETILLinkPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26060.102</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETILLinkPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
9-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
10-
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100alpha1PackageVersion>11.0.0-alpha.1.26060.102</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100alpha1PackageVersion>
11-
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100alpha1PackageVersion>11.0.100-alpha.1.26060.102</MicrosoftNETWorkloadEmscriptenCurrentManifest110100alpha1PackageVersion>
9+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
10+
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100alpha1PackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100alpha1PackageVersion>
11+
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100alpha1PackageVersion>11.0.100-alpha.1.26064.107</MicrosoftNETWorkloadEmscriptenCurrentManifest110100alpha1PackageVersion>
1212
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100alpha1PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
1313
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100alpha1PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
14-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.26060.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
15-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26060.102</MicrosoftDotNetCecilPackageVersion>
14+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.26064.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
15+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26064.107</MicrosoftDotNetCecilPackageVersion>
1616
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
1717
<!-- Previous .NET Android version -->
1818
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.2</MicrosoftNETSdkAndroidManifest100100PackageVersion>

‎src/Microsoft.Android.Run/Microsoft.Android.Run.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>
77
<OutputType>Exe</OutputType>
8-
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
8+
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
99
<RootNamespace>Microsoft.Android.Run</RootNamespace>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<Nullable>enable</Nullable>
1212
<DebugType>portable</DebugType>
13+
<RollForward>Major</RollForward>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎src/Microsoft.Android.Sdk.ILLink/WarnOnPreserveAttribute.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/Mono.Android/map.csv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9476,11 +9476,11 @@ E,30,android/os/Vibrator.VIBRATION_EFFECT_SUPPORT_NO,2,Android.OS.VibrationEffec
94769476
E,30,android/os/Vibrator.VIBRATION_EFFECT_SUPPORT_UNKNOWN,0,Android.OS.VibrationEffectSupport,Unknown,remove,
94779477
E,30,android/os/Vibrator.VIBRATION_EFFECT_SUPPORT_YES,1,Android.OS.VibrationEffectSupport,Yes,remove,
94789478
I,0,android/preference/Preference.DEFAULT_ORDER,2147483647,,,,
9479-
E,19,android/print/PrintAttributes.COLOR_MODE_COLOR,2,Android.Print.PrintColorMode,Color,remove,
9480-
E,19,android/print/PrintAttributes.COLOR_MODE_MONOCHROME,1,Android.Print.PrintColorMode,Monochrome,remove,
9481-
E,23,android/print/PrintAttributes.DUPLEX_MODE_LONG_EDGE,2,Android.Print.DuplexMode,LongEdge,keep,
9482-
E,23,android/print/PrintAttributes.DUPLEX_MODE_NONE,1,Android.Print.DuplexMode,None,keep,
9483-
E,23,android/print/PrintAttributes.DUPLEX_MODE_SHORT_EDGE,4,Android.Print.DuplexMode,ShortEdge,keep,
9479+
E,19,android/print/PrintAttributes.COLOR_MODE_COLOR,2,Android.Print.PrintColorMode,Color,remove,flags
9480+
E,19,android/print/PrintAttributes.COLOR_MODE_MONOCHROME,1,Android.Print.PrintColorMode,Monochrome,remove,flags
9481+
E,23,android/print/PrintAttributes.DUPLEX_MODE_LONG_EDGE,2,Android.Print.DuplexMode,LongEdge,keep,flags
9482+
E,23,android/print/PrintAttributes.DUPLEX_MODE_NONE,1,Android.Print.DuplexMode,None,keep,flags
9483+
E,23,android/print/PrintAttributes.DUPLEX_MODE_SHORT_EDGE,4,Android.Print.DuplexMode,ShortEdge,keep,flags
94849484
E,19,android/print/PrintDocumentInfo.CONTENT_TYPE_DOCUMENT,0,Android.Print.PrintContentType,Document,remove,
94859485
E,19,android/print/PrintDocumentInfo.CONTENT_TYPE_PHOTO,1,Android.Print.PrintContentType,Photo,remove,
94869486
E,19,android/print/PrintDocumentInfo.CONTENT_TYPE_UNKNOWN,-1,Android.Print.PrintContentType,Unknown,remove,

0 commit comments

Comments
 (0)