Skip to content

Commit 2dcae8b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merge main into darc-main-2e4d8a65-7e10-47a1-97d1-1f64afd18e31
2 parents 827463b + c4dd223 commit 2dcae8b

File tree

772 files changed

+21178
-27623
lines changed

Some content is hidden

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

772 files changed

+21178
-27623
lines changed

‎.azuredevops/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

‎Razor.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ Global
554554
EndGlobalSection
555555
GlobalSection(NestedProjects) = preSolution
556556
{BCF712D4-329A-4C7A-8292-9EFC864B2ABA} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
557-
{92463391-81BE-462B-AC3C-78C6C760741F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
558557
{0F265874-C592-448B-BC4F-3430AB03E0DC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
559558
{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
560559
{E5D92DB7-5CBF-410A-9685-FF76F71EC96F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}

‎azure-pipelines-official.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
#
44

55
variables:
6+
# Defines $(DncEngInternalBuildPool)
67
- template: /eng/common/templates-official/variables/pool-providers.yml@self
8+
79
- name: Build.Repository.Clean
810
value: true
911
- name: _TeamName
@@ -75,7 +77,7 @@ extends:
7577
autoBaseline: true
7678
sdl:
7779
sourceAnalysisPool:
78-
name: NetCore1ESPool-Svc-Internal
80+
name: $(DncEngInternalBuildPool)
7981
image: 1es-windows-2022
8082
os: windows
8183
policheck:
@@ -84,7 +86,7 @@ extends:
8486
enabled: true
8587
configFile: '$(Build.SourcesDirectory)/eng/TSAConfig.gdntsa'
8688
pool:
87-
name: NetCore1ESPool-Svc-Internal
89+
name: $(DncEngInternalBuildPool)
8890
image: windows.vs2022preview.amd64
8991
os: windows
9092
customBuildTags:
@@ -420,7 +422,7 @@ extends:
420422
- job: insert
421423
displayName: Insert to VS
422424
pool:
423-
name: NetCore1ESPool-Svc-Internal
425+
name: $(DncEngInternalBuildPool)
424426
demands: ImageOverride -equals windows.vs2022.amd64
425427
steps:
426428
- download: current

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ stages:
240240
options: --init # This ensures all the stray defunct processes are reaped.
241241
pool:
242242
name: NetCore-Public
243-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
243+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
244244

245245
strategy:
246246
matrix:

‎eng/Version.Details.props‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/roslyn dependencies -->
9-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisAnalyzersPackageVersion>
10-
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisCommonPackageVersion>
11-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisCSharpPackageVersion>
12-
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
13-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
14-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
15-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
16-
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
17-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
18-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
19-
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
20-
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
21-
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
22-
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
23-
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
24-
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
25-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
26-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25461.22</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
27-
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-2.25461.22</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
28-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25461.22</MicrosoftNetCompilersToolsetPackageVersion>
29-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25461.22</MicrosoftVisualStudioLanguageServicesPackageVersion>
9+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisAnalyzersPackageVersion>
10+
<MicrosoftCodeAnalysisCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCommonPackageVersion>
11+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpPackageVersion>
12+
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
13+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
14+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
15+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
16+
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
17+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
18+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
19+
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
20+
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
21+
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
22+
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
23+
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
24+
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
25+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
26+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
27+
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.3.0-2.25567.17</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
28+
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25567.17</MicrosoftNetCompilersToolsetPackageVersion>
29+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25567.17</MicrosoftVisualStudioLanguageServicesPackageVersion>
3030
<!-- dotnet/arcade dependencies -->
3131
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetArcadeSdkPackageVersion>
3232
<!-- dotnet/aspnetcore dependencies -->

‎eng/Version.Details.xml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,89 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-2.25461.22">
5+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25567.17">
66
<Uri>https://github.com/dotnet/roslyn</Uri>
7-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
7+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-2.25461.22">
9+
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.3.0-2.25567.17">
1010
<Uri>https://github.com/dotnet/roslyn</Uri>
11-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
11+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-2.25461.22">
13+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.3.0-2.25567.17">
1414
<Uri>https://github.com/dotnet/roslyn</Uri>
15-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
15+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25461.22">
17+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.3.0-2.25567.17">
1818
<Uri>https://github.com/dotnet/roslyn</Uri>
19-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
19+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-2.25461.22">
21+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.3.0-2.25567.17">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
23-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
23+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-2.25461.22">
25+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.3.0-2.25567.17">
2626
<Uri>https://github.com/dotnet/roslyn</Uri>
27-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
27+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25461.22">
29+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0-2.25567.17">
3030
<Uri>https://github.com/dotnet/roslyn</Uri>
31-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
31+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25461.22">
33+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.3.0-2.25567.17">
3434
<Uri>https://github.com/dotnet/roslyn</Uri>
35-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
35+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-2.25461.22">
37+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.3.0-2.25567.17">
3838
<Uri>https://github.com/dotnet/roslyn</Uri>
39-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
39+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25461.22">
41+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.3.0-2.25567.17">
4242
<Uri>https://github.com/dotnet/roslyn</Uri>
43-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
43+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-2.25461.22">
45+
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.3.0-2.25567.17">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
47+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-2.25461.22">
49+
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.3.0-2.25567.17">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
51+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-2.25461.22">
53+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0-2.25567.17">
5454
<Uri>https://github.com/dotnet/roslyn</Uri>
55-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
55+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25461.22">
57+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0-2.25567.17">
5858
<Uri>https://github.com/dotnet/roslyn</Uri>
59-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
59+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25461.22">
61+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.3.0-2.25567.17">
6262
<Uri>https://github.com/dotnet/roslyn</Uri>
63-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
63+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-2.25461.22">
65+
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.3.0-2.25567.17">
6666
<Uri>https://github.com/dotnet/roslyn</Uri>
67-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
67+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-2.25461.22">
69+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.3.0-2.25567.17">
7070
<Uri>https://github.com/dotnet/roslyn</Uri>
71-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
71+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-2.25461.22">
73+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.3.0-2.25567.17">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
75+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-2.25461.22">
77+
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.3.0-2.25567.17">
7878
<Uri>https://github.com/dotnet/roslyn</Uri>
79-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
79+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25461.22">
81+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.3.0-2.25567.17">
8282
<Uri>https://github.com/dotnet/roslyn</Uri>
83-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
83+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25461.22">
85+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0-2.25567.17">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
87-
<Sha>e3cf188c71ec62089866f0e99bd535cd47878659</Sha>
87+
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>

‎eng/scripts/PublicApi/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Mark Shipped Tool
2+
========
3+
4+
This tool should be run after every supported release that has API changes. It will
5+
merge the collection of PublicApi.Shipped.txt files with the PublicApi.Unshipped.txt
6+
versions. This will take into account `*REMOVED*` elements when updating the files.
7+
8+
Usage:
9+
10+
``` cmd
11+
mark-shipped.cmd
12+
```

‎eng/scripts/PublicApi/mark-shipped.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\mark-shipped.ps1"

‎eng/scripts/PublicApi/mark-shipped.ps1‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
[CmdletBinding(PositionalBinding=$false)]
2+
param ()
3+
4+
Set-StrictMode -version 2.0
5+
$ErrorActionPreference = "Stop"
6+
7+
function MarkShipped([string]$dir) {
8+
$shippedFilePath = Join-Path $dir "PublicAPI.Shipped.txt"
9+
$shipped = Get-Content $shippedFilePath
10+
if ($null -eq $shipped) {
11+
$shipped = @()
12+
}
13+
14+
$unshippedFilePath = Join-Path $dir "PublicAPI.Unshipped.txt"
15+
$unshipped = Get-Content $unshippedFilePath
16+
$removed = @()
17+
$removedPrefix = "*REMOVED*";
18+
Write-Host "Processing $dir"
19+
20+
foreach ($item in $unshipped) {
21+
if ($item.Length -gt 0) {
22+
if ($item.StartsWith($removedPrefix)) {
23+
$item = $item.Substring($removedPrefix.Length)
24+
$removed += $item
25+
}
26+
else {
27+
$shipped += $item
28+
}
29+
}
30+
}
31+
32+
$shipped | Sort-Object | ?{ -not $removed.Contains($_) } | Out-File $shippedFilePath -Encoding Ascii
33+
"" | Out-File $unshippedFilePath -Encoding Ascii
34+
}
35+
36+
try {
37+
Push-Location (Join-Path $PSScriptRoot "..\..\..\")
38+
39+
foreach ($file in Get-ChildItem -re -in "PublicApi.Shipped.txt") {
40+
$dir = Split-Path -parent $file
41+
MarkShipped $dir
42+
}
43+
}
44+
catch {
45+
Write-Host $_
46+
Write-Host $_.Exception
47+
exit 1
48+
}
49+
finally {
50+
Pop-Location
51+
}

‎eng/targets/Services.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
<ServiceHubService Include="Microsoft.VisualStudio.Razor.SpanMapping" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteSpanMappingService+Factory" />
4545
<ServiceHubService Include="Microsoft.VisualStudio.Razor.CodeLens" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCodeLensService+Factory" />
4646
<ServiceHubService Include="Microsoft.VisualStudio.Razor.DevTools" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDevToolsService+Factory" />
47+
<ServiceHubService Include="Microsoft.VisualStudio.Razor.DataTipRange" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDataTipRangeService+Factory" />
4748
</ItemGroup>
4849
</Project>

0 commit comments

Comments
 (0)