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
38 changes: 18 additions & 20 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,36 @@ This file should be imported by eng/Versions.props
-->
<Project>
<PropertyGroup>
<!-- _git/dotnet-dotnet dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.2</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.2</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>10.0.2</MicrosoftExtensionsLoggingConsolePackageVersion>
<SystemCommandLinePackageVersion>2.0.2</SystemCommandLinePackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.2</SystemFormatsAsn1PackageVersion>
<SystemIOPipelinesPackageVersion>10.0.2</SystemIOPipelinesPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.2</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.2</SystemTextJsonPackageVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26070.115</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>10.0.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.1</SystemFormatsAsn1PackageVersion>
<SystemIOPipelinesPackageVersion>10.0.1</SystemIOPipelinesPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.1</SystemTextJsonPackageVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26103.116</MicrosoftDotNetArcadeSdkPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
<!-- _git/dotnet-runtime dependencies -->
<!-- _git/dotnet-dotnet dependencies -->
<MicrosoftBclAsyncInterfacesVersion>$(MicrosoftBclAsyncInterfacesPackageVersion)</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLoggingPackageVersion)</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsolePackageVersion)</MicrosoftExtensionsLoggingConsoleVersion>
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemDiagnosticsDiagnosticSourcePackageVersion)</SystemDiagnosticsDiagnosticSourceVersion>
<SystemFormatsAsn1Version>$(SystemFormatsAsn1PackageVersion)</SystemFormatsAsn1Version>
<SystemIOPipelinesVersion>$(SystemIOPipelinesPackageVersion)</SystemIOPipelinesVersion>
<SystemTextEncodingsWebVersion>$(SystemTextEncodingsWebPackageVersion)</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
</PropertyGroup>
</Project>
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="f962f7efe8b17a25dde3403b7d2abd5c239fcbac" BarId="298120" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="9477b510bb25fc69515d2ab188af3b72799929ac" BarId="300237" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
<Dependency Name="System.CommandLine" Version="2.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.115">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26103.116">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f962f7efe8b17a25dde3403b7d2abd5c239fcbac</Sha>
<Sha>9477b510bb25fc69515d2ab188af3b72799929ac</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="System.Formats.Asn1" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="System.Text.Json" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="System.IO.Pipelines" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>44525024595742ebe09023abe709df51de65009b</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2004.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: Azure-Linux-3-Amd64
image: build.azurelinux.3.amd64
os: linux
${{ else }}:
pool:
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.101",
"version": "10.0.102",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,9 +10,9 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.101"
"dotnet": "10.0.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.115"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.116"
}
}