Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#4817)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] authored Apr 21, 2021
1 parent ebe1bee commit 29cd684
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 31 deletions.
24 changes: 12 additions & 12 deletions Localize/LocProject.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
"LocItems": [
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\en\\strings.json",
"CopyOption": "LangIDOnName",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\en\\"
"CopyOption": "LangIDOnPath",
"OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\src\\Microsoft.VisualBasic.Forms\\src\\Resources\\Microsoft\\VisualBasic\\CompilerServices\\xlf\\VBInputBox.xlf",
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
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.21216.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21219.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
<Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21216.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21219.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
<Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21216.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21219.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
<Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21216.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21219.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
<Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21216.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21219.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
<Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21216.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21216.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21216.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21219.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21219.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21219.2</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
17 changes: 13 additions & 4 deletions eng/common/generate-locproject.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,19 @@ $locJson = @{
}
if ($continue)
{
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnName"
OutputPath = $outputPath
if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
}
}
else {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnName"
OutputPath = $outputPath
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
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.21216.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21076.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21219.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21219.10"
},
Expand Down

0 comments on commit 29cd684

Please sign in to comment.