Skip to content

[main] Update dependencies from dotnet/arcade #2268

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

Merged
dotnet-maestro merged 10 commits into from
Apr 28, 2021
Merged

[main] Update dependencies from dotnet/arcade #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa56f02
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 22, 2021
1de5f6f
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 22, 2021
04dc2c4
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 23, 2021
ff8974a
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 25, 2021
eae8fa4
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 26, 2021
b6473c0
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 26, 2021
2997ff9
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 27, 2021
3b27b9d
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 27, 2021
3671697
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Apr 28, 2021
6c6f544
Update sdk version
mmitche Apr 28, 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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ stages:
XUnitPublishTargetFramework: net6.0
IncludeDotNetCli: true
DotNetCliPackageType: sdk
DotNetCliVersion: 6.0.100-preview.2.21155.3
DotNetCliVersion: 6.0.100-preview.3.21202.5
EnableXUnitReporter: true
WaitForWorkItemCompletion: true
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21222.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21227.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
<Sha>67737ae294375c867bea72de19a66149785881e5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21222.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21227.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
<Sha>67737ae294375c867bea72de19a66149785881e5</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 5 additions & 3 deletions eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ parameters:
LclSource: lclFilesInRepo
LclPackageId: ''
RepoType: gitHub
condition: ''

jobs:
- job: OneLocBuild
Expand Down Expand Up @@ -44,6 +45,7 @@ jobs:
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
arguments: $(_GenerateLocProjectArguments)
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}

- task: OneLocBuild@2
displayName: OneLocBuild
Expand All @@ -62,20 +64,20 @@ jobs:
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
condition: always()
condition: ${{ parameters.condition }}

- task: PublishBuildArtifacts@1
displayName: Publish Localization Files
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
PublishLocation: Container
ArtifactName: Loc
condition: always()
condition: ${{ parameters.condition }}

- task: PublishBuildArtifacts@1
displayName: Publish LocProject.json
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
PublishLocation: Container
ArtifactName: Loc
condition: always()
condition: ${{ parameters.condition }}
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-preview.2.21155.3",
"dotnet": "6.0.100-preview.3.21202.5",
"runtimes": {
"dotnet": [
"2.1.11"
Expand All @@ -12,7 +12,7 @@
"cmake-test": "3.11.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21227.11",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21227.11"
}
}