Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0ab5408
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 6, 2026
b27af51
Re-generate global.json for PR #24484: [net11.0] Update dependencies …
Jan 6, 2026
02c0415
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 7, 2026
1875b87
Re-generate global.json for PR #24484: [net11.0] Update dependencies …
Jan 7, 2026
2c2c07f
Auto-format source code
Jan 7, 2026
69114de
[tests] Update SizeTestApp's expected sizes.
rolfbjarne Jan 7, 2026
a25d1bc
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 8, 2026
146c125
Re-generate global.json for PR #24484: [net11.0] Update dependencies …
Jan 8, 2026
a79636e
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 11, 2026
ad00f63
Re-generate global.json for PR #24484: [net11.0] Update dependencies …
Jan 11, 2026
39ffbb6
[tests] Update SizeTestApp's expected sizes.
rolfbjarne Jan 12, 2026
35daa31
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-3e74f…
rolfbjarne Jan 12, 2026
08927cf
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 13, 2026
d419373
Re-generate global.json for PR #24484: [net11.0] Update dependencies …
Jan 13, 2026
9c24127
[tests] Update SizeTestApp's expected sizes.
rolfbjarne Jan 13, 2026
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
20 changes: 10 additions & 10 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.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>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26062.101</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.26062.101</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.26062.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_262PackageVersion>26.2.10192</MicrosoftiOSSdknet100_262PackageVersion>
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.25619.109">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25619.109">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25619.109">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25619.109">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</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.25619.109">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25619.109">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</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.25619.109">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25619.109">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25619.109">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</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.25619.109">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26062.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
type: boolean

steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "amzn" ]; then
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.25619.109",
"version": "11.0.100-alpha.1.26062.101",
"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.25619.109"
"dotnet": "11.0.100-alpha.1.26062.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101"
}
}
86 changes: 43 additions & 43 deletions src/bgen/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6464,53 +6464,53 @@ public void Generate (Type type)
//
if (Frameworks.HaveCoreMedia && Frameworks.HaveAVFoundation && (field_pi.PropertyType == TypeCache.CMTime ||
field_pi.PropertyType == TypeCache.AVCaptureWhiteBalanceGains)) {
print ("return *(({3} *) Dlfcn.dlsym (Libraries.{2}.Handle, \"{1}\"));", field_pi.Name, fieldAttr.SymbolName, library_name,
TypeManager.FormatType (type, field_pi.PropertyType.Namespace, field_pi.PropertyType.Name));
} else if (field_pi.PropertyType == TypeCache.System_nint) {
print ("return Dlfcn.GetNInt (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.System_nuint) {
print ("return Dlfcn.GetNUInt (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.System_nfloat) {
print ("return Dlfcn.GetNFloat (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.CoreGraphics_CGSize) {
print ("return Dlfcn.GetCGSize (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.CMTag) {
print ("return Dlfcn.GetStruct<CoreMedia.CMTag> (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType.Namespace == "Foundation" && field_pi.PropertyType.Name == "NSOperatingSystemVersion") {
print ("return Dlfcn.GetStruct<Foundation.NSOperatingSystemVersion> (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType.IsEnum) {
var btype = field_pi.PropertyType.GetEnumUnderlyingType ();
if (smartEnumTypeName is not null) {
print ("if (_{0} is null)", field_pi.Name);
indent++;
print ("_{0} = Dlfcn.GetStringConstant (Libraries.{2}.Handle, \"{1}\")!;", field_pi.Name, fieldAttr.SymbolName, library_name);
indent--;
print ($"return {smartEnumTypeName}Extensions.GetValue (_{field_pi.Name});");
} else if (GetNativeEnumToManagedExpression (field_pi.PropertyType, out var preExpression, out var postExpression, out var _)) {
if (btype == TypeCache.System_nint || btype == TypeCache.System_Int64)
print ($"return {preExpression}Dlfcn.GetNInt (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\"){postExpression};");
else if (btype == TypeCache.System_nuint || btype == TypeCache.System_UInt64)
print ($"return {preExpression}Dlfcn.GetNUInt (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\"){postExpression};");
else
throw new BindingException (1014, true, fieldTypeName, FormatPropertyInfo (field_pi));
print ("return *(({3} *) Dlfcn.dlsym (Libraries.{2}.Handle, \"{1}\"));", field_pi.Name, fieldAttr.SymbolName, library_name,
TypeManager.FormatType (type, field_pi.PropertyType.Namespace, field_pi.PropertyType.Name));
} else if (field_pi.PropertyType == TypeCache.System_nint) {
print ("return Dlfcn.GetNInt (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.System_nuint) {
print ("return Dlfcn.GetNUInt (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.System_nfloat) {
print ("return Dlfcn.GetNFloat (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.CoreGraphics_CGSize) {
print ("return Dlfcn.GetCGSize (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType == TypeCache.CMTag) {
print ("return Dlfcn.GetStruct<CoreMedia.CMTag> (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType.Namespace == "Foundation" && field_pi.PropertyType.Name == "NSOperatingSystemVersion") {
print ("return Dlfcn.GetStruct<Foundation.NSOperatingSystemVersion> (Libraries.{2}.Handle, \"{1}\");", field_pi.Name, fieldAttr.SymbolName, library_name);
} else if (field_pi.PropertyType.IsEnum) {
var btype = field_pi.PropertyType.GetEnumUnderlyingType ();
if (smartEnumTypeName is not null) {
print ("if (_{0} is null)", field_pi.Name);
indent++;
print ("_{0} = Dlfcn.GetStringConstant (Libraries.{2}.Handle, \"{1}\")!;", field_pi.Name, fieldAttr.SymbolName, library_name);
indent--;
print ($"return {smartEnumTypeName}Extensions.GetValue (_{field_pi.Name});");
} else if (GetNativeEnumToManagedExpression (field_pi.PropertyType, out var preExpression, out var postExpression, out var _)) {
if (btype == TypeCache.System_nint || btype == TypeCache.System_Int64)
print ($"return {preExpression}Dlfcn.GetNInt (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\"){postExpression};");
else if (btype == TypeCache.System_nuint || btype == TypeCache.System_UInt64)
print ($"return {preExpression}Dlfcn.GetNUInt (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\"){postExpression};");
else
throw new BindingException (1014, true, fieldTypeName, FormatPropertyInfo (field_pi));
} else {
if (btype == TypeCache.System_Int32)
print ($"return ({fieldTypeName}) Dlfcn.GetInt32 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_UInt32)
print ($"return ({fieldTypeName}) Dlfcn.GetUInt32 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_Int64)
print ($"return ({fieldTypeName}) Dlfcn.GetInt64 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_UInt64)
print ($"return ({fieldTypeName}) Dlfcn.GetUInt64 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else
throw new BindingException (1014, true, fieldTypeName, FormatPropertyInfo (field_pi));
}
} else {
if (btype == TypeCache.System_Int32)
print ($"return ({fieldTypeName}) Dlfcn.GetInt32 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_UInt32)
print ($"return ({fieldTypeName}) Dlfcn.GetUInt32 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_Int64)
print ($"return ({fieldTypeName}) Dlfcn.GetInt64 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
else if (btype == TypeCache.System_UInt64)
print ($"return ({fieldTypeName}) Dlfcn.GetUInt64 (Libraries.{library_name}.Handle, \"{fieldAttr.SymbolName}\");");
if (field_pi.PropertyType == TypeCache.System_String)
throw new BindingException (1013, true);
else
throw new BindingException (1014, true, fieldTypeName, FormatPropertyInfo (field_pi));
}
} else {
if (field_pi.PropertyType == TypeCache.System_String)
throw new BindingException (1013, true);
else
throw new BindingException (1014, true, fieldTypeName, FormatPropertyInfo (field_pi));
}

indent--;
print ("}");
Expand Down
Loading
Loading