Skip to content

Commit 96bac02

Browse files
abonieabonie
authored
Merge pull request #16874 from dotnet/merges/main-to-lsp
Merge main to lsp
2 parents 8932a2f + 4f388c0 commit 96bac02

File tree

77 files changed

+786
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+786
-213
lines changed

‎.github/workflows/repository_lockdown_check.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: Repository lockdown check
2+
on:
3+
pull_request_target:
4+
types: [opened, synchronize, reopened]
5+
branches:
6+
- 'main'
7+
- 'release/*'
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
jobs:
12+
repository_lockdown:
13+
permissions:
14+
issues: write
15+
pull-requests: write
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Check if lockdown is in place
21+
run: |
22+
set -e
23+
if [[ ${{ vars.LOCKDOWN }} == "true" ]]; then
24+
exit 1
25+
fi
26+
# Did bot already comment the PR?
27+
- name: Find Comment
28+
if: (success() || failure())
29+
uses: peter-evans/[email protected]
30+
id: fc
31+
with:
32+
issue-number: ${{github.event.pull_request.number}}
33+
comment-author: 'github-actions[bot]'
34+
body-includes: '<!-- DO_NOT_REMOVE: repository_lockdown -->'
35+
# If not, create a new comment
36+
- name: Create comment
37+
if: steps.fc.outputs.comment-id == '' && failure()
38+
uses: actions/github-script@v6
39+
with:
40+
github-token: ${{ github.token }}
41+
script: |
42+
let body = "<!-- DO_NOT_REMOVE: repository_lockdown -->\n\n> [!CAUTION]\n>Repository is on lockdown for maintenance, all merges are on hold."
43+
const comment = await github.rest.issues.createComment({
44+
issue_number: context.issue.number,
45+
owner: context.repo.owner,
46+
repo: context.repo.repo,
47+
body: body
48+
});
49+
return comment.data.id;
50+
# If yes, update the comment
51+
- name: Update comment
52+
if: steps.fc.outputs.comment-id != '' && failure()
53+
uses: actions/github-script@v6
54+
with:
55+
github-token: ${{ github.token }}
56+
script: |
57+
let body = "<!-- DO_NOT_REMOVE: repository_lockdown -->\n\n> [!CAUTION]\n>Repository is on lockdown for maintenance, all merges are on hold."
58+
const comment = await github.rest.issues.updateComment({
59+
owner: context.repo.owner,
60+
repo: context.repo.repo,
61+
comment_id: ${{steps.fc.outputs.comment-id}},
62+
body: body
63+
});
64+
return comment.data.id;
65+
# If comment exists, but we are no longer in maintenance mode, delete the comment.
66+
- name: Delete comment
67+
if: steps.fc.outputs.comment-id != '' && success()
68+
uses: actions/github-script@v6
69+
with:
70+
github-token: ${{ github.token }}
71+
script: |
72+
let body = "<!-- DO_NOT_REMOVE: repository_lockdown -->\n\n> [!CAUTION]\n>Repository is on lockdown for maintenance, all merges are on hold."
73+
const comment = await github.rest.issues.deleteComment({
74+
owner: context.repo.owner,
75+
repo: context.repo.repo,
76+
comment_id: ${{steps.fc.outputs.comment-id}}
77+
});
78+
return 0;

‎FSharp.sln‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{4E4F41D9-8
6262
docs\optimizations.md = docs\optimizations.md
6363
docs\optimizations-equality.md = docs\optimizations-equality.md
6464
docs\overview.md = docs\overview.md
65+
docs\builder-caches.md = docs\builder-caches.md
66+
docs\changing-the-ast.md = docs\changing-the-ast.md
67+
docs\names.md = docs\names.md
68+
docs\perf-discussions-archive.md = docs\perf-discussions-archive.md
69+
docs\project-builds.md = docs\project-builds.md
70+
docs\representations.md = docs\representations.md
71+
docs\running-documentation-locally.md = docs\running-documentation-locally.md
72+
docs\tooling-features.md = docs\tooling-features.md
6573
EndProjectSection
6674
EndProject
6775
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fcs", "fcs", "{B86EBFF1-E03E-4FAE-89BF-60A4CAE2BC78}"
@@ -79,6 +87,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fcs", "fcs", "{B86EBFF1-E03
7987
docs\fcs\tokenizer.fsx = docs\fcs\tokenizer.fsx
8088
docs\fcs\typedtree.fsx = docs\fcs\typedtree.fsx
8189
docs\fcs\untypedtree.fsx = docs\fcs\untypedtree.fsx
90+
docs\fcs\untypedtree-apis.fsx = docs\fcs\untypedtree-apis.fsx
8291
EndProjectSection
8392
EndProject
8493
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsc\fscProject\fsc.fsproj", "{10D15DBB-EFF0-428C-BA83-41600A93EEC4}"
@@ -105,6 +114,56 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
105114
EndProject
106115
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Benchmarks.Common", "tests\benchmarks\FSharp.Benchmarks.Common\FSharp.Benchmarks.Common.fsproj", "{7D482560-DF6F-46A5-B50C-20ECF7C38759}"
107116
EndProject
117+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{10F0D468-FD52-4658-811E-7ED6A8318449}"
118+
ProjectSection(SolutionItems) = preProject
119+
docs\content\fsdocs-theme.css = docs\content\fsdocs-theme.css
120+
EndProjectSection
121+
EndProject
122+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{99773BD6-F1D7-48E2-AD72-AC48DA6BB293}"
123+
ProjectSection(SolutionItems) = preProject
124+
docs\img\favicon.ico = docs\img\favicon.ico
125+
docs\img\logo.png = docs\img\logo.png
126+
EndProjectSection
127+
EndProject
128+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "release-notes", "release-notes", "{C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}"
129+
ProjectSection(SolutionItems) = preProject
130+
docs\release-notes\About.md = docs\release-notes\About.md
131+
docs\release-notes\FSharp.Compiler.Service.fsx = docs\release-notes\FSharp.Compiler.Service.fsx
132+
docs\release-notes\FSharp.Core.fsx = docs\release-notes\FSharp.Core.fsx
133+
docs\release-notes\Language.fsx = docs\release-notes\Language.fsx
134+
EndProjectSection
135+
EndProject
136+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".aux", ".aux", "{F1DADFB8-F320-40B6-B430-0ED5C37D3BAC}"
137+
ProjectSection(SolutionItems) = preProject
138+
docs\release-notes\.aux\Common.fsx = docs\release-notes\.aux\Common.fsx
139+
EndProjectSection
140+
EndProject
141+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".FSharp.Compiler.Service", ".FSharp.Compiler.Service", "{01C43145-5289-47BF-A19B-B9F0FB66254D}"
142+
ProjectSection(SolutionItems) = preProject
143+
docs\release-notes\.FSharp.Compiler.Service\8.0.100.md = docs\release-notes\.FSharp.Compiler.Service\8.0.100.md
144+
docs\release-notes\.FSharp.Compiler.Service\8.0.200.md = docs\release-notes\.FSharp.Compiler.Service\8.0.200.md
145+
docs\release-notes\.FSharp.Compiler.Service\8.0.202.md = docs\release-notes\.FSharp.Compiler.Service\8.0.202.md
146+
docs\release-notes\.FSharp.Compiler.Service\8.0.300.md = docs\release-notes\.FSharp.Compiler.Service\8.0.300.md
147+
EndProjectSection
148+
EndProject
149+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".FSharp.Core", ".FSharp.Core", "{23798638-A1E9-4DAE-9C9C-F5D87499ADD6}"
150+
ProjectSection(SolutionItems) = preProject
151+
docs\release-notes\.FSharp.Core\8.0.200.md = docs\release-notes\.FSharp.Core\8.0.200.md
152+
docs\release-notes\.FSharp.Core\8.0.300.md = docs\release-notes\.FSharp.Core\8.0.300.md
153+
EndProjectSection
154+
EndProject
155+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Language", ".Language", "{1478B841-73BD-4E68-8F23-413ABB0B991F}"
156+
ProjectSection(SolutionItems) = preProject
157+
docs\release-notes\.Language\8.0.md = docs\release-notes\.Language\8.0.md
158+
docs\release-notes\.Language\preview.md = docs\release-notes\.Language\preview.md
159+
EndProjectSection
160+
EndProject
161+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".VisualStudio", ".VisualStudio", "{AF70EC5A-8E7C-4FDA-857D-AF08082CFC64}"
162+
ProjectSection(SolutionItems) = preProject
163+
docs\release-notes\.VisualStudio\17.9.md = docs\release-notes\.VisualStudio\17.9.md
164+
docs\release-notes\.VisualStudio\17.10.md = docs\release-notes\.VisualStudio\17.10.md
165+
EndProjectSection
166+
EndProject
108167
Global
109168
GlobalSection(SolutionConfigurationPlatforms) = preSolution
110169
Debug|Any CPU = Debug|Any CPU
@@ -433,6 +492,14 @@ Global
433492
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
434493
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
435494
{7D482560-DF6F-46A5-B50C-20ECF7C38759} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
495+
{10F0D468-FD52-4658-811E-7ED6A8318449} = {4E4F41D9-86A7-4F5D-B735-1A0744AB68AC}
496+
{99773BD6-F1D7-48E2-AD72-AC48DA6BB293} = {4E4F41D9-86A7-4F5D-B735-1A0744AB68AC}
497+
{C28ABF2D-6B43-4B0F-A12B-38570C5D9A81} = {4E4F41D9-86A7-4F5D-B735-1A0744AB68AC}
498+
{F1DADFB8-F320-40B6-B430-0ED5C37D3BAC} = {C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}
499+
{01C43145-5289-47BF-A19B-B9F0FB66254D} = {C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}
500+
{23798638-A1E9-4DAE-9C9C-F5D87499ADD6} = {C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}
501+
{1478B841-73BD-4E68-8F23-413ABB0B991F} = {C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}
502+
{AF70EC5A-8E7C-4FDA-857D-AF08082CFC64} = {C28ABF2D-6B43-4B0F-A12B-38570C5D9A81}
436503
EndGlobalSection
437504
GlobalSection(ExtensibilityGlobals) = postSolution
438505
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

‎docs/release-notes/.FSharp.Compiler.Service/8.0.300.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
* Enforce AttributeTargets on let values and functions. ([PR #16692](https://github.com/dotnet/fsharp/pull/16692))
1717
* Enforce AttributeTargets on union case declarations. ([PR #16764](https://github.com/dotnet/fsharp/pull/16764))
1818
* Disallow using base to invoke an abstract base method. ([Issue #13926](https://github.com/dotnet/fsharp/issues/13926), [PR #16773](https://github.com/dotnet/fsharp/pull/16773))
19+
* Enforce AttributeTargets on structs and classes ([PR #16790](https://github.com/dotnet/fsharp/pull/16790))
20+
* Parser: fix pattern range for idents with trivia ([PR #16824](https://github.com/dotnet/fsharp/pull/16824))
21+
* Fix broken code completion after a record type declaration ([PR #16813](https://github.com/dotnet/fsharp/pull/16813))
1922

2023
### Added
2124

@@ -26,6 +29,7 @@
2629
* Add switch to generate types and members with IL visibility that accurately represents their F# visibility. ([PR #15484](https://github.com/dotnet/fsharp/pull/15484)
2730
* Allow returning bool instead of unit option for partial active patterns. ([Language suggestion #1041](https://github.com/fsharp/fslang-suggestions/issues/1041), [PR #16473](https://github.com/dotnet/fsharp/pull/16473))
2831
* Symbols: Add GenericArguments to FSharpEntity ([PR #16470](https://github.com/dotnet/fsharp/pull/16470))
32+
* Add extended data for `DefinitionsInSigAndImplNotCompatibleAbbreviationsDiffer` (FS0318). ([PR #16811](https://github.com/dotnet/fsharp/pull/16811)))
2933

3034
### Changed
3135

‎docs/release-notes/.FSharp.Core/8.0.300.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
### Fixed
77

88
* Preserve original stack traces in resumable state machines generated code if available. ([PR #16568](https://github.com/dotnet/fsharp/pull/16568))
9+
* Enforce AttributeTargets on structs and classes. Also update `RequireQualifiedAccessAttribute` and `AutoOpenAttribute` to use `AttributeTargets.Struct` ([PR #16790](https://github.com/dotnet/fsharp/pull/16790))

‎docs/release-notes/.Language/preview.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Allow extension methods without type attribute work for types from imported assemblies. ([PR #16368](https://github.com/dotnet/fsharp/pull/16368))
1212
* Enforce AttributeTargets on let values and functions. ([PR #16692](https://github.com/dotnet/fsharp/pull/16692))
1313
* Enforce AttributeTargets on union case declarations. ([PR #16764](https://github.com/dotnet/fsharp/pull/16764))
14+
* Enforce AttributeTargets on structs and classes ([PR #16790](https://github.com/dotnet/fsharp/pull/16790))
1415

1516
### Changed
1617

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
</Dependency>
3131
</ProductDependencies>
3232
<ToolsetDependencies>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24151.4">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24161.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282</Sha>
35+
<Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
3636
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5352
}
5453

5554
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
55+
function AddCredential($creds, $source, $username, $pwd) {
5756
# Looks for credential configuration for the given SourceName. Create it if none is found.
5857
$sourceElement = $creds.SelectSingleNode($Source)
5958
if ($sourceElement -eq $null)
@@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
8281
$passwordElement.SetAttribute("key", "ClearTextPassword")
8382
$sourceElement.AppendChild($passwordElement) | Out-Null
8483
}
85-
$passwordElement.SetAttribute("value", $Password)
84+
85+
$passwordElement.SetAttribute("value", $pwd)
8686
}
8787

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
88+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9292

9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
95+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
9696
}
9797
}
9898

@@ -144,13 +144,13 @@ if ($disabledSources -ne $null) {
144144
$userName = "dn-bot"
145145

146146
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
147+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148148

149149
# 3.1 uses a different feed url format so it's handled differently here
150150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151151
if ($dotnet31Source -ne $null) {
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
153-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
152+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
153+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
154154
}
155155

156156
$dotnetVersions = @('5','6','7','8')
@@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;
160160
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161161
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164164
}
165165
}
166166

167-
$doc.Save($filename)
167+
$doc.Save($filename)

‎eng/common/templates-official/job/job.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ parameters:
1515
timeoutInMinutes: ''
1616
variables: []
1717
workspace: ''
18+
templateContext: ''
1819

1920
# Job base template specific parameters
2021
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
6869
${{ if ne(parameters.timeoutInMinutes, '') }}:
6970
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
7071

72+
${{ if ne(parameters.templateContext, '') }}:
73+
templateContext: ${{ parameters.templateContext }}
74+
7175
variables:
7276
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7377
- name: DOTNET_CLI_TELEMETRY_PROFILE

‎eng/common/templates/job/job.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ parameters:
1515
timeoutInMinutes: ''
1616
variables: []
1717
workspace: ''
18+
templateContext: ''
1819

1920
# Job base template specific parameters
2021
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
6869
${{ if ne(parameters.timeoutInMinutes, '') }}:
6970
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
7071

72+
${{ if ne(parameters.templateContext, '') }}:
73+
templateContext: ${{ parameters.templateContext }}
74+
7175
variables:
7276
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7377
- name: DOTNET_CLI_TELEMETRY_PROFILE

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"perl": "5.38.0.1"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24151.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1",
2121
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2222
}
2323
}

0 commit comments

Comments
 (0)