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

Jump to bottom

[main] Update dependencies from dotnet/arcade #4794

Merged
merged 1 commit into from
Apr 15, 2021
Merged

[main] Update dependencies from dotnet/arcade #4794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -150,25 +150,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21212.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21214.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
<Sha>93a6389f406e5e900da46ab643c608578f143851</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21212.6">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21214.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
<Sha>93a6389f406e5e900da46ab643c608578f143851</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21212.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21214.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
<Sha>93a6389f406e5e900da46ab643c608578f143851</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21212.6">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21214.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
<Sha>93a6389f406e5e900da46ab643c608578f143851</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21212.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21214.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha>
<Sha>93a6389f406e5e900da46ab643c608578f143851</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
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 @@ -53,9 +53,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21212.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21214.5</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21214.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21214.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>16.5.0</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
3 changes: 3 additions & 0 deletions eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ parameters:

SourcesDirectory: $(Build.SourcesDirectory)
CreatePr: true
AutoCompletePr: false
UseCheckedInLocProjectJson: false
LanguageSet: VS_Main_Languages
LclSource: lclFilesInRepo
Expand Down Expand Up @@ -54,6 +55,8 @@ jobs:
lclSource: ${{ parameters.LclSource }}
lclPackageId: ${{ parameters.LclPackageId }}
isCreatePrSelected: ${{ parameters.CreatePr }}
${{ if eq(parameters.CreatePr, true) }}:
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
Expand Down
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 @@ -14,9 +14,9 @@
"version": "6.0.100-preview.2.21155.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21076.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21212.6",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21214.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.4.21213.3"
},
Expand Down