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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +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-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-e50f95b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e50f95bd/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25528.106</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25528.106</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25530.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25530.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25528.106</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25530.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
Expand Down
32 changes: 16 additions & 16 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.25528.106">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25528.106">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</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">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25528.106">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</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 @@ -78,25 +78,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</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.25528.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25530.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
15 changes: 7 additions & 8 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,22 @@ parameters:
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
# Location of the MicroBuild output folder
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
microBuildOutputFolder: '$(Build.SourcesDirectory)'

continueOnError: false

steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- script: |
Expand Down Expand Up @@ -65,7 +64,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
Expand All @@ -85,7 +84,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
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.25528.106",
"version": "10.0.100-rtm.25530.104",
"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.25528.106"
"dotnet": "10.0.100-rtm.25530.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25530.104"
}
}
Loading