Skip to content

Commit a3bae7d

Browse files
dotnet-maestro[bot]mmitcheadamsitnik
authored
[main] Source code updates from dotnet/dotnet (#2762)
* Backflow from https://github.com/dotnet/dotnet / 887f3d5 build 297286 * Backflow from https://github.com/dotnet/dotnet / e069e8e build 297688 * Add dotnet11 package source to NuGet.config * Update .NET runtime version in global.json * Update Ubuntu image from 20.04 to 22.04 * Removed installation of unnecessary packages from CI pipeline. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
1 parent 702b2bb commit a3bae7d

9 files changed

Lines changed: 15 additions & 16 deletions

File tree

.vsts-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ stages:
6868
displayName: Ubuntu
6969
pool:
7070
name: NetCore-Svc-Public
71-
demands: ImageOverride -equals 1es-ubuntu-2004-open
71+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
7272
strategy:
7373
matrix:
7474
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
@@ -81,7 +81,6 @@ stages:
8181
steps:
8282
- checkout: self
8383
clean: true
84-
- bash: sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev
8584
- script: eng/common/cibuild.sh
8685
--configuration $(_BuildConfig)
8786
--prepareMachine

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26076.102</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f" BarId="296906" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="93b03446d269bf71bb3ab1cce56e696913709c8a" BarId="298921" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26062.101">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26076.102">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
9+
<Sha>93b03446d269bf71bb3ab1cce56e696913709c8a</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<VersionPrefix>3.0.0</VersionPrefix>
7-
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
7+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
99
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1010
<DotNetFinalVersionKind></DotNetFinalVersionKind>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

eng/common/core-templates/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
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')]
66-
image: 1es-azurelinux-3
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

eng/common/templates/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "11.0.100-alpha.1.25618.104",
3+
"version": "11.0.100-alpha.1.26064.118",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "11.0.100-alpha.1.25618.104",
8+
"dotnet": "11.0.100-alpha.1.26064.118",
99
"runtimes": {
1010
"dotnet": [
11-
"8.0.22"
11+
"10.0.2"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101"
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26076.102"
1717
}
1818
}

0 commit comments

Comments
 (0)