Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25616.107</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25616.107</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25616.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25619.109</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25619.109</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25619.109</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_262PackageVersion>26.2.10192</MicrosoftiOSSdknet100_262PackageVersion>
Expand All @@ -26,7 +26,7 @@ This file should be imported by eng/Versions.props
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
<MicrosofttvOSSdknet100_262PackageVersion>26.2.10192</MicrosofttvOSSdknet100_262PackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25603.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25516.4</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25616.107">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25616.107">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25616.107">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25616.107">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25616.107">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25616.107">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25616.107">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25616.107">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25616.107">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25616.107">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.4-RELEASE"
__FreeBSDBase="13.5-RELEASE"
__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
Expand Down Expand Up @@ -383,7 +383,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
__FreeBSDBase="14.2-RELEASE"
__FreeBSDBase="14.3-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-alpha.1.25616.107",
"version": "11.0.100-alpha.1.25619.109",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-alpha.1.25616.107"
"dotnet": "11.0.100-alpha.1.25619.109"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25616.107"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109"
}
}
12 changes: 3 additions & 9 deletions tests/dotnet/UnitTests/XcodeProjectTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -389,15 +389,9 @@ public void InvalidSchemeErroriOS ()
var properties = GetDefaultProperties ();
var rv = DotNet.AssertBuildFailure (proj, properties);
var expectedErrorContent = $"xcodebuild: error: The project named \"{xcodeProjName}\" does not contain a scheme named \"{invaldSchemeName}\".";
var errors = BinLog.GetBuildLogErrors (rv.BinLogPath).ToArray ();
AssertErrorMessages (errors,
new Func<string, bool> [] {
(msg) => msg?.Contains (expectedErrorContent) == true
},
new Func<string> [] {
() => expectedErrorContent
}
);
var errors = BinLog.GetBuildMessages (rv.BinLogPath).ToArray ();
var anyExpectedError = errors.Where (v => v.Message?.Contains (expectedErrorContent) == true);
Assert.That (anyExpectedError.Any (), Is.True, "Expected error");
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AppBundleSize: 224,480,500 bytes (219,219.2 KB = 214.1 MB)
AppBundleSize: 224,480,509 bytes (219,219.2 KB = 214.1 MB)
# The following list of files and their sizes is just informational / for review, and isn't used in the test:
_CodeSignature/CodeResources: 46,829 bytes (45.7 KB = 0.0 MB)
archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
Info.plist: 1,158 bytes (1.1 KB = 0.0 MB)
Info.plist: 1,167 bytes (1.1 KB = 0.0 MB)
libcoreclr.dylib: 6,692,608 bytes (6,535.8 KB = 6.4 MB)
libmscordaccore.dylib: 2,386,528 bytes (2,330.6 KB = 2.3 MB)
libmscordbi.dylib: 1,852,576 bytes (1,809.2 KB = 1.8 MB)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AppBundleSize: 3,631,040 bytes (3,545.9 KB = 3.5 MB)
AppBundleSize: 3,631,049 bytes (3,545.9 KB = 3.5 MB)
# The following list of files and their sizes is just informational / for review, and isn't used in the test:
_CodeSignature/CodeResources: 3,997 bytes (3.9 KB = 0.0 MB)
archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
Info.plist: 1,158 bytes (1.1 KB = 0.0 MB)
Info.plist: 1,167 bytes (1.1 KB = 0.0 MB)
Microsoft.iOS.dll: 150,528 bytes (147.0 KB = 0.1 MB)
PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
runtimeconfig.bin: 1,405 bytes (1.4 KB = 0.0 MB)
Expand Down
4 changes: 2 additions & 2 deletions tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AppBundleSize: 9,463,548 bytes (9,241.7 KB = 9.0 MB)
AppBundleSize: 9,463,557 bytes (9,241.8 KB = 9.0 MB)
# The following list of files and their sizes is just informational / for review, and isn't used in the test:
_CodeSignature/CodeResources: 5,229 bytes (5.1 KB = 0.0 MB)
aot-instances.aotdata.arm64: 816,632 bytes (797.5 KB = 0.8 MB)
archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
Info.plist: 1,158 bytes (1.1 KB = 0.0 MB)
Info.plist: 1,167 bytes (1.1 KB = 0.0 MB)
Microsoft.iOS.aotdata.arm64: 22,880 bytes (22.3 KB = 0.0 MB)
Microsoft.iOS.dll: 48,640 bytes (47.5 KB = 0.0 MB)
PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
Expand Down
4 changes: 2 additions & 2 deletions tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AppBundleSize: 3,827,109 bytes (3,737.4 KB = 3.6 MB)
AppBundleSize: 3,827,118 bytes (3,737.4 KB = 3.6 MB)
# The following list of files and their sizes is just informational / for review, and isn't used in the test:
_CodeSignature/CodeResources: 3,879 bytes (3.8 KB = 0.0 MB)
archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
Info.plist: 1,158 bytes (1.1 KB = 0.0 MB)
Info.plist: 1,167 bytes (1.1 KB = 0.0 MB)
libSystem.Globalization.Native.dylib: 94,032 bytes (91.8 KB = 0.1 MB)
libSystem.IO.Compression.Native.dylib: 875,296 bytes (854.8 KB = 0.8 MB)
libSystem.Native.dylib: 147,168 bytes (143.7 KB = 0.1 MB)
Expand Down
Loading