Skip to content

Commit

Permalink
Squashed commit of the following: (#10942)
Browse files Browse the repository at this point in the history
commit 22b3033
Merge: 50866a7 95ee1a3
Author: Matthew Leibowitz <mattleibow@live.com>
Date:   Thu Oct 27 11:10:47 2022 +0200

    Merge branch 'net7.0' into darc-net7.0-45fa6a48-68f2-4992-95f2-e40e8e14afd5

commit 50866a7
Author: Jonathan Dick <jondick@gmail.com>
Date:   Wed Oct 26 21:22:02 2022 -0400

    Bump net6 version for SR7

commit 8edadd3
Author: Rui Marinho <me@ruimarinho.net>
Date:   Wed Oct 26 18:55:17 2022 +0100

    Update NuGet.config

commit b7c5411
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:49 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.24

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 4c57036
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:09 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.24

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 89f722e
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:31 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.21

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit 9dc4a41
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:01 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.21

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit dde2135
Author: Rui Marinho <me@ruimarinho.net>
Date:   Wed Oct 26 17:46:35 2022 +0100

    Add Nuget.config feed

commit bad3509
Author: GitHub Actions Autoformatter <autoformat@example.com>
Date:   Wed Oct 26 16:41:26 2022 +0000

    Auto-format source code

commit 6d56d6c
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:27 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.22

    Microsoft.MacCatalyst.Sdk
     From Version 15.4.2370 -> To Version 15.4.2371

commit 2da2d4d
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:10 2022 +0000

    Update dependencies from https://github.com/xamarin/xamarin-macios build 20221026.22

    Microsoft.macOS.Sdk
     From Version 12.3.2370 -> To Version 12.3.2371

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
  • Loading branch information
dotnet-maestro[bot] and mattleibow committed Oct 27, 2022
1 parent ee9a2e1 commit c4fea78
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2370">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2371">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
<Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2370">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2371">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>16925e40c98a9789323ade1c8a0660968d8ac244</Sha>
<Sha>efd24e1e4f4b92c8d4a098c90c7dabcc053f9f32</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1475">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1477">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
<Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1475">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1477">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>12993a6a15caf9793f3b65db21407f085ea2ae4f</Sha>
<Sha>4402959f7d048f253a627915131ea2219bdba2fc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.545</MicrosoftMauiPreviousDotNetReleasedVersion>
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.546</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
Expand All @@ -13,10 +13,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>15.4.2370</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.2370</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.0.1475</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.0.1475</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.2371</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.2371</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.0.1477</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.0.1477</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
Expand Down

0 comments on commit c4fea78

Please sign in to comment.