WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 686e980

Browse files
committed
Merge remote-tracking branch 'origin/release/10.0.1xx-preview1' into darc-release/10.0.1xx-preview1-9c92d446-1ecf-4526-a5f0-92f4f36c6e17
2 parents 7c5bcaf + acf008f commit 686e980

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

eng/Versions.props

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<!-- Versions updated by maestro -->
5-
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25120.13</MicrosoftNETSdkPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
7-
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
8-
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
10-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
11-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
12-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
13-
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
14-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
15-
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
16-
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetArcadeSdkPackageVersion>
17-
<!-- Manually updated versions -->
18-
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
19-
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>
20-
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
21-
<!-- This is a subscription of the .NET 8 versions of our packages -->
22-
<MicrosoftMacCatalystSdknet80_180PackageVersion>18.0.8314</MicrosoftMacCatalystSdknet80_180PackageVersion>
23-
<MicrosoftmacOSSdknet80_150PackageVersion>15.0.8314</MicrosoftmacOSSdknet80_150PackageVersion>
24-
<MicrosoftiOSSdknet80_180PackageVersion>18.0.8314</MicrosoftiOSSdknet80_180PackageVersion>
25-
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8314</MicrosofttvOSSdknet80_180PackageVersion>
26-
<!-- This is a subscription to the .NET 8/Xcode 15.0 versions of our packages -->
27-
<MicrosoftMacCatalystSdknet80_170PackageVersion>17.0.8523</MicrosoftMacCatalystSdknet80_170PackageVersion>
28-
<MicrosoftmacOSSdknet80_140PackageVersion>14.0.8523</MicrosoftmacOSSdknet80_140PackageVersion>
29-
<MicrosoftiOSSdknet80_170PackageVersion>17.0.8523</MicrosoftiOSSdknet80_170PackageVersion>
30-
<MicrosofttvOSSdknet80_170PackageVersion>17.0.8523</MicrosofttvOSSdknet80_170PackageVersion>
31-
<!-- This is a subscription to the .NET 9/Xcode 16.0 versions of our packages -->
32-
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
33-
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
34-
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
35-
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
4+
<!-- Versions updated by maestro -->
5+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25120.13</MicrosoftNETSdkPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
7+
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
8+
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
9+
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
10+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
11+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
12+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
13+
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
14+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
15+
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
16+
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetArcadeSdkPackageVersion>
17+
<!-- Manually updated versions -->
18+
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
19+
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>
20+
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
21+
<!-- This is a subscription of the .NET 8 versions of our packages -->
22+
<MicrosoftMacCatalystSdknet80_180PackageVersion>18.0.8314</MicrosoftMacCatalystSdknet80_180PackageVersion>
23+
<MicrosoftmacOSSdknet80_150PackageVersion>15.0.8314</MicrosoftmacOSSdknet80_150PackageVersion>
24+
<MicrosoftiOSSdknet80_180PackageVersion>18.0.8314</MicrosoftiOSSdknet80_180PackageVersion>
25+
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8314</MicrosofttvOSSdknet80_180PackageVersion>
26+
<!-- This is a subscription to the .NET 8/Xcode 15.0 versions of our packages -->
27+
<MicrosoftMacCatalystSdknet80_170PackageVersion>17.0.8523</MicrosoftMacCatalystSdknet80_170PackageVersion>
28+
<MicrosoftmacOSSdknet80_140PackageVersion>14.0.8523</MicrosoftmacOSSdknet80_140PackageVersion>
29+
<MicrosoftiOSSdknet80_170PackageVersion>17.0.8523</MicrosoftiOSSdknet80_170PackageVersion>
30+
<MicrosofttvOSSdknet80_170PackageVersion>17.0.8523</MicrosofttvOSSdknet80_170PackageVersion>
31+
<!-- This is a subscription to the .NET 9/Xcode 16.0 versions of our packages -->
32+
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
33+
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
34+
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
35+
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
3636
</PropertyGroup>
3737
</Project>

tests/dotnet/UnitTests/ProjectTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2053,7 +2053,6 @@ public void BuildAndExecuteAppWithWinExeOutputType (ApplePlatform platform, stri
20532053
[TestCase (ApplePlatform.iOS, "iossimulator-x64")]
20542054
[TestCase (ApplePlatform.MacOSX, "osx-arm64")]
20552055
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64")]
2056-
[Ignore ("https://github.com/dotnet/sdk/issues/46790")]
20572056
public void PublishAotDuringBuild (ApplePlatform platform, string runtimeIdentifiers)
20582057
{
20592058
var project = "MySimpleApp";
@@ -2071,7 +2070,6 @@ public void PublishAotDuringBuild (ApplePlatform platform, string runtimeIdentif
20712070
[TestCase (ApplePlatform.iOS, "ios-arm64")]
20722071
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
20732072
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
2074-
[Ignore ("https://github.com/dotnet/sdk/issues/46790")]
20752073
public void BuildMyNativeAotAppWithTrimAnalysisWarning (ApplePlatform platform, string runtimeIdentifiers)
20762074
{
20772075
var project = "MyNativeAotAppWithTrimAnalysisWarning";

0 commit comments

Comments
 (0)