Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/10.0.1xx-preview1' into …
Browse files Browse the repository at this point in the history
…darc-release/10.0.1xx-preview1-9c92d446-1ecf-4526-a5f0-92f4f36c6e17
  • Loading branch information
rolfbjarne committed Feb 24, 2025
2 parents 7c5bcaf + acf008f commit 686e980
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 34 deletions.
64 changes: 32 additions & 32 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25120.13</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- This is a subscription of the .NET 8 versions of our packages -->
<MicrosoftMacCatalystSdknet80_180PackageVersion>18.0.8314</MicrosoftMacCatalystSdknet80_180PackageVersion>
<MicrosoftmacOSSdknet80_150PackageVersion>15.0.8314</MicrosoftmacOSSdknet80_150PackageVersion>
<MicrosoftiOSSdknet80_180PackageVersion>18.0.8314</MicrosoftiOSSdknet80_180PackageVersion>
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8314</MicrosofttvOSSdknet80_180PackageVersion>
<!-- This is a subscription to the .NET 8/Xcode 15.0 versions of our packages -->
<MicrosoftMacCatalystSdknet80_170PackageVersion>17.0.8523</MicrosoftMacCatalystSdknet80_170PackageVersion>
<MicrosoftmacOSSdknet80_140PackageVersion>14.0.8523</MicrosoftmacOSSdknet80_140PackageVersion>
<MicrosoftiOSSdknet80_170PackageVersion>17.0.8523</MicrosoftiOSSdknet80_170PackageVersion>
<MicrosofttvOSSdknet80_170PackageVersion>17.0.8523</MicrosofttvOSSdknet80_170PackageVersion>
<!-- This is a subscription to the .NET 9/Xcode 16.0 versions of our packages -->
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
<!-- Versions updated by maestro -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25120.13</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- This is a subscription of the .NET 8 versions of our packages -->
<MicrosoftMacCatalystSdknet80_180PackageVersion>18.0.8314</MicrosoftMacCatalystSdknet80_180PackageVersion>
<MicrosoftmacOSSdknet80_150PackageVersion>15.0.8314</MicrosoftmacOSSdknet80_150PackageVersion>
<MicrosoftiOSSdknet80_180PackageVersion>18.0.8314</MicrosoftiOSSdknet80_180PackageVersion>
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8314</MicrosofttvOSSdknet80_180PackageVersion>
<!-- This is a subscription to the .NET 8/Xcode 15.0 versions of our packages -->
<MicrosoftMacCatalystSdknet80_170PackageVersion>17.0.8523</MicrosoftMacCatalystSdknet80_170PackageVersion>
<MicrosoftmacOSSdknet80_140PackageVersion>14.0.8523</MicrosoftmacOSSdknet80_140PackageVersion>
<MicrosoftiOSSdknet80_170PackageVersion>17.0.8523</MicrosoftiOSSdknet80_170PackageVersion>
<MicrosofttvOSSdknet80_170PackageVersion>17.0.8523</MicrosofttvOSSdknet80_170PackageVersion>
<!-- This is a subscription to the .NET 9/Xcode 16.0 versions of our packages -->
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
</PropertyGroup>
</Project>
2 changes: 0 additions & 2 deletions tests/dotnet/UnitTests/ProjectTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,6 @@ public void BuildAndExecuteAppWithWinExeOutputType (ApplePlatform platform, stri
[TestCase (ApplePlatform.iOS, "iossimulator-x64")]
[TestCase (ApplePlatform.MacOSX, "osx-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64")]
[Ignore ("https://github.com/dotnet/sdk/issues/46790")]
public void PublishAotDuringBuild (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "MySimpleApp";
Expand All @@ -2071,7 +2070,6 @@ public void PublishAotDuringBuild (ApplePlatform platform, string runtimeIdentif
[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
[Ignore ("https://github.com/dotnet/sdk/issues/46790")]
public void BuildMyNativeAotAppWithTrimAnalysisWarning (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "MyNativeAotAppWithTrimAnalysisWarning";
Expand Down

0 comments on commit 686e980

Please sign in to comment.