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
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
3 changes: 3 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-115a295-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-115a2957-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-9b865f6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-9b865f6d/nuget/v3/index.json" />
Expand Down Expand Up @@ -37,6 +38,8 @@
<add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
<!-- Add a 9.0.11 feed -->
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
<!-- Add a 9.0.12 feed -->
<add key="darc-pub-dotnet-runtime-9c2fb4b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9c2fb4b7/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
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>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25531.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25531.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25568.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25568.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.1</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25568.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
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="10.0.100-rtm.25531.102">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.101-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25531.102">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.1-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</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="10.0.0">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25531.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
Expand Down Expand Up @@ -95,25 +95,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25527.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b9f51d9ff3ac9411d1aa9988ef20bfda9a041418</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
17 changes: 15 additions & 2 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}

# Check for dotnet-eng and add dotnet-eng-internal if present
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
if ($dotnetEngSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

# Check for dotnet-tools and add dotnet-tools-internal if present
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
if ($dotnetToolsSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

$doc.Save($filename)
17 changes: 15 additions & 2 deletions eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env bash

# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
fi
done

# Check for dotnet-eng and add dotnet-eng-internal if present
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
fi

# Check for dotnet-tools and add dotnet-tools-internal if present
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
fi

# I want things split line by line
PrevIFS=$IFS
IFS=$'\n'
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ jobs:
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,11 @@ stages:

- task: NuGetAuthenticate@1

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
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": "10.0.100-rtm.25531.102",
"version": "10.0.101-servicing.25568.102",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.100-rtm.25531.102"
"dotnet": "10.0.101-servicing.25568.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject(ObjCRuntime.NativeHandle, Syst
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject(System.IntPtr, ObjCRuntime.Runtime/MissingCtorResolution, System.Boolean)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject(System.IntPtr, System.Boolean, ObjCRuntime.Runtime/MissingCtorResolution, System.Boolean)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject(System.IntPtr, System.Type, ObjCRuntime.Runtime/MissingCtorResolution, System.Boolean, System.Boolean, out System.Boolean&)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject(System.IntPtr)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject`1(System.IntPtr, System.Boolean)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject`1(System.IntPtr, System.IntPtr, System.RuntimeMethodHandle, System.Boolean, System.Boolean)
Microsoft.iOS.dll:ObjCRuntime.Runtime.GetNSObject`1(System.IntPtr, System.IntPtr, System.RuntimeMethodHandle, System.Boolean)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
AppBundleSize: 3,589,940 bytes (3,505.8 KB = 3.4 MB)
AppBundleSize: 3,610,442 bytes (3,525.8 KB = 3.4 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,138 bytes (1.1 KB = 0.0 MB)
Info.plist: 1,176 bytes (1.1 KB = 0.0 MB)
Microsoft.iOS.dll: 149,504 bytes (146.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)
SizeTestApp: 2,384,080 bytes (2,328.2 KB = 2.3 MB)
SizeTestApp: 2,404,544 bytes (2,348.2 KB = 2.3 MB)
SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
System.Private.CoreLib.aotdata.arm64: 41,296 bytes (40.3 KB = 0.0 MB)
System.Private.CoreLib.dll: 987,136 bytes (964.0 KB = 0.9 MB)
Expand Down
8 changes: 4 additions & 4 deletions tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
AppBundleSize: 9,886,903 bytes (9,655.2 KB = 9.4 MB)
AppBundleSize: 9,907,237 bytes (9,675.0 KB = 9.4 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: 839,496 bytes (819.8 KB = 0.8 MB)
archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
Info.plist: 1,138 bytes (1.1 KB = 0.0 MB)
Microsoft.iOS.aotdata.arm64: 22,832 bytes (22.3 KB = 0.0 MB)
Info.plist: 1,176 bytes (1.1 KB = 0.0 MB)
Microsoft.iOS.aotdata.arm64: 22,840 bytes (22.3 KB = 0.0 MB)
Microsoft.iOS.dll: 47,616 bytes (46.5 KB = 0.0 MB)
PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
runtimeconfig.bin: 1,808 bytes (1.8 KB = 0.0 MB)
SizeTestApp: 7,506,592 bytes (7,330.7 KB = 7.2 MB)
SizeTestApp: 7,526,880 bytes (7,350.5 KB = 7.2 MB)
SizeTestApp.aotdata.arm64: 1,456 bytes (1.4 KB = 0.0 MB)
SizeTestApp.dll: 7,168 bytes (7.0 KB = 0.0 MB)
System.Private.CoreLib.aotdata.arm64: 661,064 bytes (645.6 KB = 0.6 MB)
Expand Down
Loading