Skip to content

Commit cd53c6b

Browse files
AndriySvyrydAndriySvyryd
authored
Merge branch 'main' into merge/release/10.0-to-main
2 parents 739cdf5 + f8d5e5e commit cd53c6b

38 files changed

Lines changed: 128 additions & 124 deletions

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
4747
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
4848
<PublishWindowsPdb>false</PublishWindowsPdb>
49+
50+
<DefaultNetCoreTargetFramework>$(NetCurrent)</DefaultNetCoreTargetFramework>
4951
</PropertyGroup>
5052

5153
<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">

‎activate.ps1‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ function deactivate ([switch]$init) {
2020
}
2121

2222
Remove-Item env:DOTNET_ROOT -ErrorAction Ignore
23-
Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ErrorAction Ignore
2423
if (-not $init) {
2524
# Remove the deactivate function
2625
Remove-Item function:deactivate
@@ -33,8 +32,6 @@ deactivate -init
3332
$_OLD_PATH = $env:PATH
3433
# Tell dotnet where to find itself
3534
$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet"
36-
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
37-
$env:DOTNET_MULTILEVEL_LOOKUP = 0
3835
# Put dotnet first on PATH
3936
$env:PATH = "${env:DOTNET_ROOT};${env:PATH}"
4037

‎activate.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ deactivate () {
2828
fi
2929

3030
unset DOTNET_ROOT
31-
unset DOTNET_MULTILEVEL_LOOKUP
3231
if [ ! "${1:-}" = "init" ] ; then
3332
# Remove the deactivate function
3433
unset -f deactivate
@@ -42,8 +41,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4241
_OLD_PATH="$PATH"
4342
# Tell dotnet where to find itself
4443
export DOTNET_ROOT="$DIR/.dotnet"
45-
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
46-
export DOTNET_MULTILEVEL_LOOKUP=0
4744
# Put dotnet first on PATH
4845
export PATH="$DOTNET_ROOT:$PATH"
4946

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.3.25578.104</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.3.25578.104</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25578.104</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>10.0.0-rc.3.25578.104</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26070.110</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26070.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26070.110</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.1.26070.110</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.1.26070.110</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.1.26070.110</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>11.0.0-preview.1.26070.110</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>11.0.0-preview.1.26070.110</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.1.26070.110</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>11.0.0-preview.1.26070.110</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1" BarId="292651" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="a8b46ab052618a946f8b728e7ffa6566ef7c094b" BarId="298090" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.3.25578.104">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.1.26070.110">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
7+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.3.25578.104">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.1.26070.110">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
11+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.3.25578.104">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.1.26070.110">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
15+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.3.25578.104">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.1.26070.110">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
19+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.3.25578.104">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.1.26070.110">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
23+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.3.25578.104">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.1.26070.110">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
27+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.3.25578.104">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.1.26070.110">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
31+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.3.25578.104">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.1.26070.110">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
35+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.3.25578.104">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.1.26070.110">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
39+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25578.104">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.1.26070.110">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
43+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25578.104">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.1.26070.110">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
47+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25578.104">
49+
<Dependency Name="System.Text.Json" Version="11.0.0-preview.1.26070.110">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
51+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25578.104">
53+
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.1.26070.110">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
55+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.3.25578.104">
57+
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.1.26070.110">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
59+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.3.25578.104">
61+
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.1.26070.110">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
63+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.104">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26070.110">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
69+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25578.104">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26070.110">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
73+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.104">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26070.110">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
77+
<Sha>a8b46ab052618a946f8b728e7ffa6566ef7c094b</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,39 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup Label="Version settings">
6-
<VersionPrefix>10.0.3</VersionPrefix>
7-
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration></PreReleaseVersionIteration>
6+
<VersionPrefix>11.0.0</VersionPrefix>
7+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
8+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
99
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1010
<DotNetFinalVersionKind></DotNetFinalVersionKind>
1111

1212
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
13-
<DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>
1413

1514
<!-- Arcade features -->
1615
<UsingToolXliff>false</UsingToolXliff>
1716
</PropertyGroup>
18-
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
19-
<!-- Use the current stable builds for MSBuild and Roslyn packages, next version (non-servicing) will use the preview builds -->
17+
18+
<PropertyGroup Label="MSBuild and Roslyn">
2019
<MicrosoftBuildFrameworkVersion>18.0.2</MicrosoftBuildFrameworkVersion>
2120
<MicrosoftBuildUtilitiesCoreVersion>18.0.2</MicrosoftBuildUtilitiesCoreVersion>
2221
<MicrosoftBuildTasksCoreVersion>18.0.2</MicrosoftBuildTasksCoreVersion>
2322
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
2423
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
2524
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
2625
</PropertyGroup>
26+
2727
<PropertyGroup Label="Test dependencies">
28-
<!-- For this prerelease version, see https://github.com/dotnet/roslyn-sdk/issues/1175 -->
29-
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.25564.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
30-
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.25564.1</MicrosoftCodeAnalysisCSharpTestingVersion>
28+
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3</MicrosoftCodeAnalysisAnalyzerTestingVersion>
29+
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3</MicrosoftCodeAnalysisCSharpTestingVersion>
3130
<AzureIdentityVersion>1.17.1</AzureIdentityVersion>
3231
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
3332
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
3433
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
3534
</PropertyGroup>
35+
3636
<PropertyGroup Label="Analyzers">
3737
<StyleCopAnalyzersVersion>1.1.118</StyleCopAnalyzersVersion>
3838
<DotNetAnalyzersDocumentationAnalyzersVersion>1.0.0-beta.59</DotNetAnalyzersDocumentationAnalyzersVersion>
3939
</PropertyGroup>
40+
4041
</Project>

‎eng/common/core-templates/job/job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
templateContext: ${{ parameters.templateContext }}
7474

7575
variables:
76+
- name: AllowPtrToDetectTestRunRetryFiles
77+
value: true
7678
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7779
- name: DOTNET_CLI_TELEMETRY_PROFILE
7880
value: '$(Build.Repository.Uri)'

‎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-mariner-2
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ stages:
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2022.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/core-templates/steps/install-microbuild-impl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
type: boolean
1919

2020
steps:
21-
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
21+
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
2222
- task: MicroBuildSigningPluginPreview@4
2323
displayName: Install Preview MicroBuild plugin
2424
inputs: ${{ parameters.microbuildTaskInputs }}

0 commit comments

Comments
 (0)