Skip to content

Commit c5f7df4

Browse files
rmarinhormarinho
committed
Setup CoherentParentDependency for iOS
1 parent 9aa9d9f commit c5f7df4

File tree

3 files changed

+18
-42
lines changed

3 files changed

+18
-42
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
88
<!-- Begin: Package sources from dotnet-macios -->
99
<add key="darc-pub-dotnet-macios-8d30875" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-8d308759/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
1110
<!-- End: Package sources from dotnet-macios -->
1211
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1312
<!-- Begin: Package sources from dotnet-dotnet -->

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,57 +17,39 @@
1717
<Uri>https://github.com/dotnet/android</Uri>
1818
<Sha>01024bb616e7b80417a2c6d320885bfdb956f20a</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net11.0_26.2" Version="26.2.11233-ci.net11-0">
20+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net11.0_26.2" Version="26.2.11243-ci.net11-0">
2121
<Uri>https://github.com/dotnet/macios</Uri>
22-
<Sha>13be6a67ad7fb5968639d67a357bd04f892ed381</Sha>
22+
<Sha>3a2ccef60e1fef9e9fcb90f7d93efdf2b6a9d573</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.macOS.Sdk.net11.0_26.2" Version="26.2.11233-ci.net11-0">
24+
<Dependency Name="Microsoft.macOS.Sdk.net11.0_26.2" Version="26.2.11243-ci.net11-0">
2525
<Uri>https://github.com/dotnet/macios</Uri>
26-
<Sha>13be6a67ad7fb5968639d67a357bd04f892ed381</Sha>
26+
<Sha>3a2ccef60e1fef9e9fcb90f7d93efdf2b6a9d573</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.iOS.Sdk.net11.0_26.2" Version="26.2.11233-ci.net11-0">
28+
<Dependency Name="Microsoft.iOS.Sdk.net11.0_26.2" Version="26.2.11243-ci.net11-0">
2929
<Uri>https://github.com/dotnet/macios</Uri>
30-
<Sha>13be6a67ad7fb5968639d67a357bd04f892ed381</Sha>
30+
<Sha>3a2ccef60e1fef9e9fcb90f7d93efdf2b6a9d573</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.tvOS.Sdk.net11.0_26.2" Version="26.2.11233-ci.net11-0">
32+
<Dependency Name="Microsoft.tvOS.Sdk.net11.0_26.2" Version="26.2.11243-ci.net11-0">
3333
<Uri>https://github.com/dotnet/macios</Uri>
34-
<Sha>13be6a67ad7fb5968639d67a357bd04f892ed381</Sha>
34+
<Sha>3a2ccef60e1fef9e9fcb90f7d93efdf2b6a9d573</Sha>
3535
</Dependency>
3636
<!-- Previous .NET iOS version(s) -->
37-
<!-- This is a subscription of the .NET 10 latest stable versions of our packages -->
38-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.2" Version="26.2.10192">
37+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net11.0_26.2">
3938
<Uri>https://github.com/dotnet/macios</Uri>
4039
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
4140
</Dependency>
42-
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.2" Version="26.2.10192">
41+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.macOS.Sdk.net11.0_26.2">
4342
<Uri>https://github.com/dotnet/macios</Uri>
4443
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
4544
</Dependency>
46-
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.2" Version="26.2.10192">
45+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.iOS.Sdk.net11.0_26.2">
4746
<Uri>https://github.com/dotnet/macios</Uri>
4847
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
4948
</Dependency>
50-
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.2" Version="26.2.10192">
49+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.tvOS.Sdk.net11.0_26.2">
5150
<Uri>https://github.com/dotnet/macios</Uri>
5251
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
5352
</Dependency>
54-
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
55-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9754">
56-
<Uri>https://github.com/dotnet/macios</Uri>
57-
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
58-
</Dependency>
59-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9754">
60-
<Uri>https://github.com/dotnet/macios</Uri>
61-
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
62-
</Dependency>
63-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9754">
64-
<Uri>https://github.com/dotnet/macios</Uri>
65-
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
66-
</Dependency>
67-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9754">
68-
<Uri>https://github.com/dotnet/macios</Uri>
69-
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
70-
</Dependency>
7153
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
7254
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
7355
</Dependency>

‎eng/Versions.props‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<MinorVersion>0</MinorVersion>
66
<PatchVersion>0</PatchVersion>
77
<SdkBandVersion>11.0.100</SdkBandVersion>
8-
<PreReleaseVersionLabel>c1.net11</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel>ci.net11</PreReleaseVersionLabel>
99
<PreReleaseVersionLabel Condition="'$(BUILD_SOURCEBRANCH)' == 'refs/heads/inflight/current'">ci.inflight</PreReleaseVersionLabel>
1010
<PreReleaseVersionIteration>
1111
</PreReleaseVersionIteration>
@@ -57,20 +57,15 @@
5757
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5858
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5959
<!-- xamarin/xamarin-macios -->
60-
<MicrosoftMacCatalystSdknet110_262PackageVersion>26.2.11233-ci.net11-0</MicrosoftMacCatalystSdknet110_262PackageVersion>
61-
<MicrosoftmacOSSdknet110_262PackageVersion>26.2.11233-ci.net11-0</MicrosoftmacOSSdknet110_262PackageVersion>
62-
<MicrosoftiOSSdknet110_262PackageVersion>26.2.11233-ci.net11-0</MicrosoftiOSSdknet110_262PackageVersion>
63-
<MicrosofttvOSSdknet110_262PackageVersion>26.2.11233-ci.net11-0</MicrosofttvOSSdknet110_262PackageVersion>
60+
<MicrosoftMacCatalystSdknet110_262PackageVersion>26.2.11243-ci.net11-0</MicrosoftMacCatalystSdknet110_262PackageVersion>
61+
<MicrosoftmacOSSdknet110_262PackageVersion>26.2.11243-ci.net11-0</MicrosoftmacOSSdknet110_262PackageVersion>
62+
<MicrosoftiOSSdknet110_262PackageVersion>26.2.11243-ci.net11-0</MicrosoftiOSSdknet110_262PackageVersion>
63+
<MicrosofttvOSSdknet110_262PackageVersion>26.2.11243-ci.net11-0</MicrosofttvOSSdknet110_262PackageVersion>
6464
<!-- This is a subscription of the .NET 10 latest stable versions of our packages -->
6565
<MicrosoftMacCatalystSdknet100_262PackageVersion>26.2.10192</MicrosoftMacCatalystSdknet100_262PackageVersion>
6666
<MicrosoftmacOSSdknet100_262PackageVersion>26.2.10192</MicrosoftmacOSSdknet100_262PackageVersion>
6767
<MicrosoftiOSSdknet100_262PackageVersion>26.2.10192</MicrosoftiOSSdknet100_262PackageVersion>
6868
<MicrosofttvOSSdknet100_262PackageVersion>26.2.10192</MicrosofttvOSSdknet100_262PackageVersion>
69-
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
70-
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9754</MicrosoftMacCatalystSdknet90_260PackageVersion>
71-
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9754</MicrosoftmacOSSdknet90_260PackageVersion>
72-
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
73-
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9754</MicrosofttvOSSdknet90_260PackageVersion>
7469
<!-- Samsung/Tizen.NET -->
7570
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
7671
<!-- wasdk -->
@@ -93,7 +88,7 @@
9388
<MicrosoftAspNetCoreMetadataPackageVersion>11.0.0-alpha.1.26065.101</MicrosoftAspNetCoreMetadataPackageVersion>
9489
<MicrosoftJSInteropPackageVersion>11.0.0-alpha.1.26065.101</MicrosoftJSInteropPackageVersion>
9590
<!-- Everything else (previous edition) -->
96-
<MicrosoftAspNetCorePackageVersion>10.0.0</MicrosoftAspNetCorePackageVersion>
91+
<MicrosoftAspNetCorePackageVersion>10.0.2</MicrosoftAspNetCorePackageVersion>
9792
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
9893
<MicrosoftAspNetCoreAuthenticationFacebookPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthenticationFacebookPreviousPackageVersion>
9994
<MicrosoftAspNetCoreAuthenticationGooglePreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthenticationGooglePreviousPackageVersion>

0 commit comments

Comments
 (0)