Skip to content

Commit 4504840

Browse files
dalexsotodalexsoto
authored
[xcode16] Merge main into xcode16 (#20908)
2 parents d19f950 + 20b5341 commit 4504840

240 files changed

Lines changed: 11041 additions & 9599 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Make.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ MIN_WATCHOS_SIMULATOR_VERSION=8.0
306306
MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=15.0
307307
MIN_TVOS_SIMULATOR_VERSION=15.0
308308
# These are the simulator package ids for the versions above
309-
EXTRA_SIMULATORS=com.apple.pkg.AppleTVSimulatorSDK15_0 com.apple.pkg.iPhoneSimulatorSDK15_0 com.apple.pkg.WatchSimulatorSDK8_0
309+
EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK15_0 com.apple.pkg.AppleTVSimulatorSDK15_0 com.apple.pkg.WatchSimulatorSDK8_0
310310

311311
INCLUDE_IOS=1
312312
INCLUDE_MAC=1

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-emsdk -->
13+
<add key="darc-pub-dotnet-emsdk-71359b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-71359b18/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-emsdk -->
1415
<!-- Begin: Package sources from dotnet-aspnetcore -->
1516
<!-- End: Package sources from dotnet-aspnetcore -->
1617
<!-- Begin: Package sources from dotnet-runtime -->
18+
<add key="darc-pub-dotnet-runtime-ca4f0fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ca4f0fe3/nuget/v3/index.json" />
1719
<!-- End: Package sources from dotnet-runtime -->
1820
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1921
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />

‎Versions-ios.plist.in‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<string>16.4</string>
4141
<string>17.0</string>
4242
<string>17.2</string>
43+
<string>17.4</string>
44+
<string>17.5</string>
4345
<string>18.0</string>
4446
</array>
4547
<key>tvOS</key>
@@ -71,6 +73,8 @@
7173
<string>16.4</string>
7274
<string>17.0</string>
7375
<string>17.2</string>
76+
<string>17.4</string>
77+
<string>17.5</string>
7478
<string>18.0</string>
7579
</array>
7680
<key>watchOS</key>
@@ -98,6 +102,8 @@
98102
<string>9.4</string>
99103
<string>10.0</string>
100104
<string>10.2</string>
105+
<string>10.4</string>
106+
<string>10.5</string>
101107
<string>11.0</string>
102108
</array>
103109
<key>MacCatalyst</key>
@@ -119,6 +125,8 @@
119125
<string>16.4</string>
120126
<string>17.0</string>
121127
<string>17.2</string>
128+
<string>17.4</string>
129+
<string>17.5</string>
122130
<string>18.0</string>
123131
</array>
124132
</dict>
@@ -158,6 +166,12 @@
158166
<string>14.0</string>
159167
<key>17.2</key>
160168
<string>14.2</string>
169+
<key>17.4</key>
170+
<string>14.4</string>
171+
<key>17.5</key>
172+
<string>14.5</string>
173+
<key>18.0</key>
174+
<string>15.0</string>
161175
</dict>
162176
<key>RecommendedXcodeVersion</key>
163177
<string>@XCODE_VERSION@</string>

‎Versions-mac.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<string>13.3</string>
2525
<string>14.0</string>
2626
<string>14.2</string>
27+
<string>14.4</string>
28+
<string>14.5</string>
2729
<string>15.0</string>
2830
</array>
2931
</dict>

‎builds/Versions-MacCatalyst.plist.in‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<string>16.4</string>
2626
<string>17.0</string>
2727
<string>17.2</string>
28+
<string>17.4</string>
29+
<string>17.5</string>
2830
<string>18.0</string>
2931
</array>
3032
</dict>
@@ -52,6 +54,8 @@
5254
<string>16.4</string>
5355
<string>17.0</string>
5456
<string>17.2</string>
57+
<string>17.4</string>
58+
<string>17.5</string>
5559
<string>18.0</string>
5660
</array>
5761
</dict>
@@ -87,6 +91,16 @@
8791
<string>13.1</string>
8892
<key>16.4</key>
8993
<string>13.3</string>
94+
<key>17.0</key>
95+
<string>14.0</string>
96+
<key>17.2</key>
97+
<string>14.2</string>
98+
<key>17.4</key>
99+
<string>14.4</string>
100+
<key>17.5</key>
101+
<string>14.5</string>
102+
<key>18.0</key>
103+
<string>15.0</string>
90104
</dict>
91105
<key>RecommendedXcodeVersion</key>
92106
<string>@XCODE_VERSION@</string>

‎builds/Versions-iOS.plist.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<string>16.4</string>
4141
<string>17.0</string>
4242
<string>17.2</string>
43+
<string>17.4</string>
44+
<string>17.5</string>
4345
<string>18.0</string>
4446
</array>
4547
</dict>
@@ -86,6 +88,8 @@
8688
<string>16.4</string>
8789
<string>17.0</string>
8890
<string>17.2</string>
91+
<string>17.4</string>
92+
<string>17.5</string>
8993
<string>18.0</string>
9094
</array>
9195
</dict>

‎builds/Versions-macOS.plist.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<string>13.3</string>
2525
<string>14.0</string>
2626
<string>14.2</string>
27+
<string>14.4</string>
28+
<string>14.5</string>
2729
<string>15.0</string>
2830
</array>
2931
</dict>
@@ -49,6 +51,8 @@
4951
<string>13.3</string>
5052
<string>14.0</string>
5153
<string>14.2</string>
54+
<string>14.4</string>
55+
<string>14.5</string>
5256
<string>15.0</string>
5357
</array>
5458
</dict>

‎builds/Versions-tvOS.plist.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<string>16.4</string>
3636
<string>17.0</string>
3737
<string>17.2</string>
38+
<string>17.4</string>
39+
<string>17.5</string>
3840
<string>18.0</string>
3941
</array>
4042
</dict>
@@ -76,6 +78,8 @@
7678
<string>16.4</string>
7779
<string>17.0</string>
7880
<string>17.2</string>
81+
<string>17.4</string>
82+
<string>17.5</string>
7983
<string>18.0</string>
8084
</array>
8185
</dict>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878
<Uri>https://github.com/dotnet/templating</Uri>
7979
<Sha />
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="9.0.0-prerelease.24326.1">
81+
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="9.0.0-prerelease.24354.1">
8282
<Uri>https://github.com/dotnet/xharness</Uri>
83-
<Sha>c1a7044cbe36ea67281412766a417eece02fb3a5</Sha>
83+
<Sha>0302f46c9df3a01533fc7b911a77b3507af64e15</Sha>
8484
</Dependency>
8585
</ToolsetDependencies>
8686
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>8.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1212
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
1313
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23509.2</MicrosoftDotNetCecilPackageVersion>
14-
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24326.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
14+
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24354.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
1515
<!-- Manually updated versions -->
1616
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
1717
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>

0 commit comments

Comments
 (0)