Skip to content

Merge main to release/dev17.10 #16607

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
merged 3 commits into from
Jan 30, 2024
Merged

Merge main to release/dev17.10 #16607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dbefa0
[main] Update dependencies from dotnet/arcade (#16586)
dotnet-maestro[bot] Jan 29, 2024
3a72f0f
Fix a script (#16592)
psfinaki Jan 29, 2024
1cee523
Merge branch 'release/dev17.10' into merges/main-to-release/dev17.10
T-Gro Jan 30, 2024
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
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 @@ -29,9 +29,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24073.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24075.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4c941e2e3ae61502bd4ffd711930f662fd808375</Sha>
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
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 @@ -17,7 +17,7 @@
"perl": "5.38.0.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24073.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
}
}
4 changes: 2 additions & 2 deletions tests/scripts/update-baselines.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
open System
open System.IO

// this script is usefull for tests using a .bsl file (baseline) containing expected compiler output
// this script is useful for tests using a .bsl file (baseline) containing expected compiler output
// which is matched against .vserr or .err file aside once the test has run
// the script replaces all the .bsl/.bslpp with either .err or .vserr

let diff path1 path2 =
let result = System.Text.StringBuilder()
let append s = result.AppendLine s |> ignore
let append (s: string) = result.AppendLine s |> ignore

if not <| File.Exists(path1) then failwithf "Invalid path %s" path1
if not <| File.Exists(path2) then failwithf "Invalid path %s" path2
Expand Down