Skip to content

[main] Update dependencies from dotnet/arcade #936

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 11 commits into from
Apr 5, 2023
Merged

[main] Update dependencies from dotnet/arcade #936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e760779
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 6, 2023
091cea7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 9, 2023
12bba41
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 16, 2023
ea19c75
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 23, 2023
9488887
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 30, 2023
22241d6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 6, 2023
2aada3a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 13, 2023
96b03d0
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 20, 2023
e57d34e
Update TFMs to the latest
tmat Feb 23, 2023
e7788ce
Fix Gitee
tmat Feb 24, 2023
cf5c229
Fix TFM
tmat Apr 5, 2023
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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20230… 
…218.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23118.1
  • Loading branch information
@dotnet-maestro @tmat
dotnet-maestro[bot] authored and tmat committed Apr 5, 2023
commit 96b03d07e3d7db5df11d9d2d9d98bec85cc2425a
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23110.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23118.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
<Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23179.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
Expand Down
9 changes: 7 additions & 2 deletions eng/common/generate-locproject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if (-not $wxlFiles) {
}
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
$macosHtmlEnFiles | ForEach-Object {
Expand Down Expand Up @@ -148,12 +148,17 @@ $locJson = @{
}
}
$sourceFile = ($_.FullName | Resolve-Path -Relative)
$lciFile = $sourceFile + ".lci"
if ($continue) {
return @{
$result = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
}
if (Test-Path $lciFile -PathType Leaf) {
$result["LciFile"] = $lciFile
}
return $result
}
}
)
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "8.0.100-alpha.1.23061.8"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1"
}
}