Skip to content
Open
Show file tree
Hide file tree
Changes from 7 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 @@ -4,7 +4,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" />
<add key="darc-pub-dotnet-dotnet-02dfa78" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-02dfa783/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
Expand Down
7 changes: 7 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ extends:
preSteps:
- powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
displayName: Create artifacts/bin directory
- powershell: |
eng/common/dotnet-install.ps1 -Version 9.0.100 -InstallDir "$(Build.SourcesDirectory)\.dotnet" -NoPath
displayName: Install .NET 9 SDK
jobs:
- ${{ each config in parameters.buildConfigurations }}:
- job: Windows_NT_${{ config.buildConfig }}
Expand Down Expand Up @@ -147,6 +150,8 @@ extends:
- _SignType: none
steps:
- template: /eng/common/templates-official/steps/enable-internal-sources.yml@self
- script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path
displayName: Install .NET 9 SDK
- script: eng/common/cibuild.sh
--configuration $(_BuildConfig)
--prepareMachine
Expand All @@ -172,6 +177,8 @@ extends:
- _SignType: none
steps:
- template: /eng/common/templates-official/steps/enable-internal-sources.yml@self
- script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path
displayName: Install .NET 9 SDK
- script: eng/common/cibuild.sh
--configuration $(_BuildConfig)
--prepareMachine
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25604.105</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.2</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="115a29577547ce136b754d96d2ebfb184595a923" BarId="291265" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="02dfa783c1f4223a5590a1b689ef381c337db1ab" BarId="293404" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.1">
<Dependency Name="System.CommandLine" Version="2.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
<Sha>02dfa783c1f4223a5590a1b689ef381c337db1ab</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25568.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25604.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
<Sha>02dfa783c1f4223a5590a1b689ef381c337db1ab</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
Expand Down
16 changes: 9 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />

<Import Project="Version.Details.props" />

<PropertyGroup>
<VersionPrefix>10.0.101</VersionPrefix>
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Calculate prerelease label -->
<VersionPrefix>10.0.102</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>

<!-- Opt-in/out repo features -->
<UsingToolXliff>true</UsingToolXliff>
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
</PropertyGroup>

</Project>
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: 1es-azurelinux-3
image: 1es-mariner-2
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.100-rc.2.25502.107",
"version": "10.0.100",
"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.100-rc.2.25502.107"
"dotnet": "10.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25604.105"
}
}
Loading