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.

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

[net7.0] Update dependencies from xamarin/xamarin-android #9968

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f8f4b5f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 7, 2022
06165ad
Update eng/Versions.props
rmarinho Sep 8, 2022
9d2a804
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 9, 2022
abfa3da
Merge branch 'net7.0' into darc-net7.0-ad2b83ef-daac-46c0-ac00-901dfe…
jonathanpeppers Sep 9, 2022
e584f88
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 9, 2022
03baa98
Merge branch 'net7.0' into darc-net7.0-ad2b83ef-daac-46c0-ac00-901dfe…
rmarinho Sep 12, 2022
03b893f
NRT annotation for iOS
jonathanpeppers Sep 12, 2022
22d0f1b
Attempt to workaround iOS analyzer check
jonathanpeppers Sep 12, 2022
db165c6
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 12, 2022
2c86de8
Revert "Attempt to workaround iOS analyzer check"
jonathanpeppers Sep 13, 2022
99e15aa
#pragma for CA1416
jonathanpeppers Sep 13, 2022
65c648e
OperatingSystem.IsMacCatalystVersionAtLeast(14)
jonathanpeppers Sep 13, 2022
58a5cfb
Revert "OperatingSystem.IsMacCatalystVersionAtLeast(14)"
jonathanpeppers Sep 13, 2022
78bfd4d
#pragma warning disable CA1416
jonathanpeppers Sep 13, 2022
596421f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 13, 2022
f7686b7
Revert "#pragma warning disable CA1416"
jonathanpeppers Sep 13, 2022
6ec4b93
Revert "#pragma for CA1416"
jonathanpeppers Sep 13, 2022
015374f
Workaround CA1416 repo-wide
jonathanpeppers Sep 13, 2022
dc2a5b9
Fix NRT warnings for NSUrl.AbsoluteString
jonathanpeppers Sep 13, 2022
2ceb54b
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 10, 2022
4475671
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 12, 2022
bdaaa9c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 14, 2022
397c14b
Set $(RuntimeIdentifier) for maccatalyst-x64
jonathanpeppers Sep 14, 2022
cc05c02
Revert "Set $(RuntimeIdentifier) for maccatalyst-x64"
jonathanpeppers Sep 14, 2022
96221aa
Revert "Update dependencies from https://github.com/xamarin/xamarin-m…
jonathanpeppers Sep 14, 2022
c3d616d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 15, 2022
79f0dbf
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 12, 2022
93efde3
Fix for Resizetizer/Catalyst interaction
jonathanpeppers Sep 15, 2022
d3c21d2
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 16, 2022
0a75a35
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 17, 2022
829d0b5
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 19, 2022
08ee17a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 20, 2022
480234e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 22, 2022
619ae03
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 27, 2022
69263f9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 28, 2022
c7013a0
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 30, 2022
a1622ee
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 1, 2022
d60ebe8
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 11, 2022
33436ad
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 12, 2022
9a9d0d2
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 13, 2022
6e314b9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 14, 2022
bef3b65
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Oct 15, 2022
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: 0 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-3f6c45a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- <add key="local" value="artifacts" /> -->
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22425.9" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22454.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>cd7df40ff129744cc664ea5c83c113ccf2763829</Sha>
<Sha>330dee39e5e4dcf765f4c41c76b94c8e4497e91c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22426.10" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.2.22425.17" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
<Sha>01708feb89968aa919f20d4c84c03ac480803b34</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.151">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.2.162">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>b9389dc0168e184758c226962a0b270d300c17eb</Sha>
<Sha>8398005ab952658fee7a060cf042e6ebb1c017b5</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1024-rc.1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -28,13 +28,13 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>fca8b10f73d022d649b8985f046fb927adbdedac</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.2.22424.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</Sha>
<Sha>3e431e984cbfefe5593ffe1d9b9942b5730ecd24</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.2.22424.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</Sha>
<Sha>3e431e984cbfefe5593ffe1d9b9942b5730ecd24</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.532</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22425.9</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22454.1</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22426.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22425.17</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>7.0.0-rc.2.22430.11</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>7.0.0-rc.2.22430.11</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.1.151</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.2.162</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.4.1024-rc.1</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.1024-rc.1</MicrosoftMacCatalystSdkPackageVersion>
Expand All @@ -20,7 +20,7 @@
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100-rc.1.22</SamsungTizenSdkPackageVersion>
rmarinho marked this conversation as resolved.
Show resolved Hide resolved
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.1.22424.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.2.22424.4</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.1.4</MicrosoftWindowsAppSDKPackageVersion>
Expand Down