Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #7876

Merged
merged 4 commits into from
Apr 18, 2024
Merged
Changes from 1 commit
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
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20240…
…417.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24217.1
dotnet-maestro[bot] committed Apr 17, 2024
commit 238adc9fd66b154cceacea7301958d5c7e66fdf4
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -27,18 +27,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24212.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24212.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24212.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ jobs:
- task: 1ES.PublishPipelineArtifact@1
inputs:
targetPath: 'artifacts/log'
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
displayName: 'Publish logs'
continueOnError: true
condition: always()
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/onelocbuild.yml
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

steps:
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ jobs:

${{ 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-mariner-2-pt
image: 1es-mariner-2
os: linux

${{ if ne(parameters.platform.pool, '') }}:
6 changes: 3 additions & 3 deletions eng/common/templates-official/post-build/post-build.yml
Original file line number Diff line number Diff line change
@@ -110,7 +110,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

steps:
@@ -150,7 +150,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022-pt
# image: 1es-windows-2022

variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"tools": {
"dotnet": "9.0.100-preview.1.24101.2",
"dotnet": "9.0.100-preview.3.24204.13",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRefPackageVersion)"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.1"
}
}

Unchanged files with check annotations Beta

DefaultIfOptionWithoutValue = "true";
}
if (DefaultValue == null && IsRequired != true)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci (Build Linux debug_configuration)

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci (Build Linux release_configuration)

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci (Build OSX release_configuration)

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci (Build OSX debug_configuration)

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)

Check failure on line 65 in src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

Azure Pipelines / templating-ci

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs#L65

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs(65,52): error IDE0100: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove redundant equality (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0100)
{
DefaultValue = ParameterConverter.GetDefault(DataType);
}