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.

Sign up for GitHub

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 #1003

Merged
merged 5 commits into from
Nov 2, 2021
Merged

[main] Update dependencies from dotnet/arcade #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52c46e3
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Oct 27, 2021
e5d70ca
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Oct 28, 2021
1fa7a3a
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Oct 29, 2021
7bb9c4e
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Oct 30, 2021
ddd6544
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 2, 2021
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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21526.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21552.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f08de5892cab40c9a0e94dcc54b4537763420494</Sha>
<Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21526.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21552.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f08de5892cab40c9a0e94dcc54b4537763420494</Sha>
<Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21526.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21552.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f08de5892cab40c9a0e94dcc54b4537763420494</Sha>
<Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21526.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21552.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f08de5892cab40c9a0e94dcc54b4537763420494</Sha>
<Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21526.1">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21552.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f08de5892cab40c9a0e94dcc54b4537763420494</Sha>
<Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.21526.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.21526.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.21552.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.21552.1</MicrosoftDotNetSignToolVersion>
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
Expand All @@ -108,7 +108,7 @@
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.21526.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.21552.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
<XliffTasksVersion>1.0.0-beta.21265.1</XliffTasksVersion>
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>
Expand Down
6 changes: 1 addition & 5 deletions eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@ jobs:
- name: GuardianPackagesConfigFile
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
pool:
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
name: Hosted VS2017
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
vmImage: windows-2019
vmImage: windows-2019
steps:
- checkout: self
clean: true
Expand Down
5 changes: 4 additions & 1 deletion eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ parameters:

# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool:
vmImage: vs2017-win2016
vmImage: 'windows-2019'

CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

SourcesDirectory: $(Build.SourcesDirectory)
CreatePr: true
AutoCompletePr: false
ReusePr: true
UseLfLineEndings: true
UseCheckedInLocProjectJson: false
LanguageSet: VS_Main_Languages
Expand Down Expand Up @@ -64,6 +65,8 @@ jobs:
${{ if eq(parameters.CreatePr, true) }}:
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
pool:
vmImage: vs2017-win2016
vmImage: 'windows-2019'
condition: ''
dependsOn: ''

Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
vmImage: vs2017-win2016
vmImage: 'windows-2019'
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
Expand All @@ -96,4 +96,4 @@ jobs:
dependsOn:
- Asset_Registry_Publish
pool:
vmImage: vs2017-win2016
vmImage: 'windows-2019'
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"vswhere": "2.5.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21526.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21526.1"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21552.1"
}
}