Skip to content

Commit 3ecef08

Browse files
Merge branch 'main' into dev/peppers/tf-selection
2 parents 26015ea + 09b8b8a commit 3ecef08

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props
142142
<NuGetProtocolPackageVersion>7.0.0-preview.2.256</NuGetProtocolPackageVersion>
143143
<NuGetVersioningPackageVersion>7.0.0-preview.2.256</NuGetVersioningPackageVersion>
144144
<!-- microsoft/testfx dependencies -->
145-
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25569.2</MicrosoftTestingPlatformPackageVersion>
146-
<MSTestPackageVersion>4.1.0-preview.25569.2</MSTestPackageVersion>
145+
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25570.2</MicrosoftTestingPlatformPackageVersion>
146+
<MSTestPackageVersion>4.1.0-preview.25570.2</MSTestPackageVersion>
147147
</PropertyGroup>
148148
<!--Property group for alternate package version names-->
149149
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,13 +557,13 @@
557557
<Uri>https://github.com/dotnet/dotnet</Uri>
558558
<Sha>f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e</Sha>
559559
</Dependency>
560-
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25569.2">
560+
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25570.2">
561561
<Uri>https://github.com/microsoft/testfx</Uri>
562-
<Sha>0439522cbd54eeebbc883d59075bbb5971755812</Sha>
562+
<Sha>9cc0d132551162d48c8082e8fd16e751c1157207</Sha>
563563
</Dependency>
564-
<Dependency Name="MSTest" Version="4.1.0-preview.25569.2">
564+
<Dependency Name="MSTest" Version="4.1.0-preview.25570.2">
565565
<Uri>https://github.com/microsoft/testfx</Uri>
566-
<Sha>0439522cbd54eeebbc883d59075bbb5971755812</Sha>
566+
<Sha>9cc0d132551162d48c8082e8fd16e751c1157207</Sha>
567567
</Dependency>
568568
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.3.25567.101">
569569
<Uri>https://github.com/dotnet/dotnet</Uri>

eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@
143143
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
144144
</PropertyGroup>
145145
<PropertyGroup Label="Workload manifest package versions">
146-
<MauiFeatureBand>10.0.100-rc.2</MauiFeatureBand>
147-
<MauiWorkloadManifestVersion>10.0.0-rc.2.25504.7</MauiWorkloadManifestVersion>
148-
<XamarinAndroidWorkloadManifestVersion>36.0.0-rc.2.332</XamarinAndroidWorkloadManifestVersion>
149-
<XamarinIOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinIOSWorkloadManifestVersion>
150-
<XamarinMacCatalystWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacCatalystWorkloadManifestVersion>
151-
<XamarinMacOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacOSWorkloadManifestVersion>
152-
<XamarinTvOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinTvOSWorkloadManifestVersion>
146+
<MauiFeatureBand>10.0.100</MauiFeatureBand>
147+
<MauiWorkloadManifestVersion>10.0.0</MauiWorkloadManifestVersion>
148+
<XamarinAndroidWorkloadManifestVersion>36.1.2</XamarinAndroidWorkloadManifestVersion>
149+
<XamarinIOSWorkloadManifestVersion>26.0.11017</XamarinIOSWorkloadManifestVersion>
150+
<XamarinMacCatalystWorkloadManifestVersion>26.0.11017</XamarinMacCatalystWorkloadManifestVersion>
151+
<XamarinMacOSWorkloadManifestVersion>26.0.11017</XamarinMacOSWorkloadManifestVersion>
152+
<XamarinTvOSWorkloadManifestVersion>26.0.11017</XamarinTvOSWorkloadManifestVersion>
153153
</PropertyGroup>
154154
<PropertyGroup Label="Pinned dependency">
155155
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

0 commit comments

Comments
 (0)