Skip to content

Commit 2078abb

Browse files
sfoslundsfoslund
committed
Merge remote-tracking branch 'upstream/main' into SelfContainedCmdOptions
2 parents 27f5cfe + 6662b74 commit 2078abb

File tree

464 files changed

+81026
-3069
lines changed

Some content is hidden

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

464 files changed

+81026
-3069
lines changed

‎.vsts-ci-richnav.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
trigger:
2+
batch: true
3+
branches:
4+
include:
5+
- main
6+
- release/*.*
7+
8+
variables:
9+
- name: teamName
10+
value: Roslyn-Project-System
11+
- name: PB_PublishBlobFeedUrl
12+
value: ''
13+
- name: _DotNetPublishToBlobFeed
14+
value: false
15+
- name: _DotNetArtifactsCategory
16+
value: .NETCore
17+
- name: _DotNetValidationArtifactsCategory
18+
value: .NETCore
19+
- name: _PublishToAzure
20+
value: false
21+
- name: PostBuildSign
22+
value: true
23+
24+
stages:
25+
- stage: build
26+
displayName: Build
27+
jobs:
28+
- template: /eng/build.yml
29+
parameters:
30+
enableRichCodeNavigation: true
31+
richCodeNavigationLanguage: 'csharp'
32+
richCodeNavigationEnvironment: 'production'
33+
agentOs: Windows_NT_FullFramework
34+
pool:
35+
name: NetCorePublic-Pool
36+
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
37+
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
38+
strategy:
39+
matrix:
40+
Build_Debug:
41+
_BuildConfig: Debug
42+
_PublishType: none
43+
_SignType: test
44+
_Test: -test
45+
Build_Release:
46+
_BuildConfig: Release
47+
_PublishType: none
48+
_SignType: test
49+
_Test: -test

‎.vsts-ci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ stages:
3737
- stage: build
3838
displayName: Build
3939
jobs:
40+
- job: Publish_Build_Configuration
41+
steps:
42+
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
43+
artifact: BuildConfiguration
44+
displayName: Publish Build Config
4045
- template: /eng/build.yml
4146
parameters:
4247
agentOs: Windows_NT

‎CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia, @pranavkm, @mkArtakMSFT
2828
/src/src/Assets/TestProjects/Razor*/ @captainsafia, @pranavkm, @mkArtakMSFT
2929

30+
# Area-Format
31+
/src/Cli/dotnet/commands/dotnet-format @jmarolf, @JoeRobich
32+
/src/Tests/dotnet-format.Tests @jmarolf, @JoeRobich
33+
3034
# Area-NuGet
3135
/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
3236
/src/Tests/dotnet-add-package.Tests @dotnet/nuget-team

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
1111
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
1212
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
13+
<!-- Used for Rich Navigation indexing task -->
14+
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1315
</packageSources>
1416
<disabledPackageSources />
1517
</configuration>

‎eng/BuildConfiguration/build-configuration.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"RetryCountLimit":1,
3+
"RetryByPipeline":{
4+
"RetryStages":[
5+
{
6+
"StageName":"build"
7+
}
8+
]
9+
}
10+
}

‎eng/Version.Details.xml‎

Lines changed: 131 additions & 123 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<PropertyGroup>
1313
<VersionPrefix>6.0.100</VersionPrefix>
1414
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
15-
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
15+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
16+
<PreReleaseBrandingLabel>rc</PreReleaseBrandingLabel>
1617
</PropertyGroup>
1718
<!-- Production Dependencies -->
1819
<PropertyGroup>
@@ -26,34 +27,35 @@
2627
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
2728
<NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
2829
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
29-
<SystemCommandLineVersion>2.0.0-beta1.21308.1</SystemCommandLineVersion>
3030
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3131
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
32-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21357.3</MicrosoftDotNetSignToolVersion>
32+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21365.11</MicrosoftDotNetSignToolVersion>
3333
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
34-
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.7.21357.1</SystemSecurityCryptographyProtectedDataPackageVersion>
34+
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.7.21365.21</SystemSecurityCryptographyProtectedDataPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3737
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3838
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
39-
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.7.21357.1</SystemReflectionMetadataLoadContextVersion>
39+
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.7.21365.21</SystemReflectionMetadataLoadContextVersion>
4040
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
4141
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
42+
<SystemCommandLineVersion>2.0.0-beta1.21361.1</SystemCommandLineVersion>
4243
</PropertyGroup>
4344
<PropertyGroup>
4445
<!-- Dependencies from https://github.com/dotnet/runtime -->
45-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21357.1</MicrosoftNETCoreAppRefPackageVersion>
46-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21357.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.7.21357.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
46+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21365.21</MicrosoftNETCoreAppRefPackageVersion>
47+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21365.21</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
48+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.7.21365.21</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4849
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
49-
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.7.21357.1</MicrosoftExtensionsDependencyModelPackageVersion>
50-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.7.21357.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51-
<MicrosoftNETHostModelVersion>6.0.0-preview.7.21357.1</MicrosoftNETHostModelVersion>
50+
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.7.21365.21</MicrosoftExtensionsDependencyModelPackageVersion>
51+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.7.21365.21</MicrosoftNETCoreDotNetHostResolverPackageVersion>
52+
<MicrosoftNETHostModelVersion>6.0.0-preview.7.21365.21</MicrosoftNETHostModelVersion>
53+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
5254
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
5355
</PropertyGroup>
5456
<PropertyGroup>
5557
<!-- Dependencies from https://github.com/nuget/nuget.client -->
56-
<NuGetBuildTasksPackageVersion>6.0.0-preview.2.129</NuGetBuildTasksPackageVersion>
58+
<NuGetBuildTasksPackageVersion>6.0.0-preview.2.136</NuGetBuildTasksPackageVersion>
5759
<NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
5860
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
5961
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
@@ -69,32 +71,36 @@
6971
</PropertyGroup>
7072
<PropertyGroup>
7173
<!-- Dependencies from https://github.com/Microsoft/vstest -->
72-
<MicrosoftNETTestSdkPackageVersion>17.0.0-preview-20210629-04</MicrosoftNETTestSdkPackageVersion>
74+
<MicrosoftNETTestSdkPackageVersion>17.0.0-preview-20210715-01</MicrosoftNETTestSdkPackageVersion>
7375
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
7476
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
7577
</PropertyGroup>
7678
<PropertyGroup>
7779
<!-- Dependencies from https://github.com/mono/linker -->
78-
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21358.3</MicrosoftNETILLinkTasksPackageVersion>
80+
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21366.1</MicrosoftNETILLinkTasksPackageVersion>
7981
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
8082
</PropertyGroup>
8183
<PropertyGroup>
8284
<!-- Dependencies from https://github.com/dotnet/runtime -->
83-
<SystemCodeDomPackageVersion>6.0.0-preview.7.21357.1</SystemCodeDomPackageVersion>
84-
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.7.21357.1</SystemTextEncodingCodePagesPackageVersion>
85+
<SystemCodeDomPackageVersion>6.0.0-preview.7.21365.21</SystemCodeDomPackageVersion>
86+
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.7.21365.21</SystemTextEncodingCodePagesPackageVersion>
8587
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
86-
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.7.21357.1</SystemResourcesExtensionsPackageVersion>
88+
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.7.21365.21</SystemResourcesExtensionsPackageVersion>
89+
</PropertyGroup>
90+
<PropertyGroup>
91+
<!-- Dependencies from https://github.com/dotnet/format -->
92+
<DotnetFormatVersion>6.0.231801</DotnetFormatVersion>
8793
</PropertyGroup>
8894
<PropertyGroup>
8995
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
90-
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21356.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
96+
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21362.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
9197
</PropertyGroup>
9298
<PropertyGroup>
9399
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
94-
<MicrosoftBuildPackageVersion>17.0.0-preview-21330-06</MicrosoftBuildPackageVersion>
100+
<MicrosoftBuildPackageVersion>17.0.0-preview-21365-02</MicrosoftBuildPackageVersion>
95101
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
96102
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
97-
<MicrosoftBuildLocalizationPackageVersion>17.0.0-preview-21330-06</MicrosoftBuildLocalizationPackageVersion>
103+
<MicrosoftBuildLocalizationPackageVersion>17.0.0-preview-21365-02</MicrosoftBuildLocalizationPackageVersion>
98104
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
99105
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
100106
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
@@ -105,42 +111,42 @@
105111
</PropertyGroup>
106112
<PropertyGroup>
107113
<!-- Dependencies from https://github.com/dotnet/templating -->
108-
<MicrosoftTemplateEngineCliPackageVersion>6.0.100-preview.7.21359.2</MicrosoftTemplateEngineCliPackageVersion>
109-
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.100-preview.7.21359.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
110-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.100-preview.7.21359.2</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
111-
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.100-preview.7.21359.2</MicrosoftTemplateEngineUtilsPackageVersion>
112-
<MicrosoftTemplateSearchCommonPackageVersion>6.0.100-preview.7.21359.2</MicrosoftTemplateSearchCommonPackageVersion>
114+
<MicrosoftTemplateEngineCliPackageVersion>6.0.100-rc.1.21366.2</MicrosoftTemplateEngineCliPackageVersion>
115+
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.100-rc.1.21366.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
116+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.100-rc.1.21366.2</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
117+
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.100-rc.1.21366.2</MicrosoftTemplateEngineUtilsPackageVersion>
118+
<MicrosoftTemplateSearchCommonPackageVersion>6.0.100-rc.1.21366.2</MicrosoftTemplateSearchCommonPackageVersion>
113119
</PropertyGroup>
114120
<PropertyGroup>
115121
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
116-
<MicrosoftFSharpCompilerPackageVersion>12.0.0-beta.21357.3</MicrosoftFSharpCompilerPackageVersion>
122+
<MicrosoftFSharpCompilerPackageVersion>12.0.0-beta.21365.2</MicrosoftFSharpCompilerPackageVersion>
117123
</PropertyGroup>
118124
<PropertyGroup>
119125
<!-- Dependencies from https://github.com/dotnet/roslyn -->
120-
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-2.21358.2</MicrosoftNetCompilersToolsetPackageVersion>
121-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-2.21358.2</MicrosoftCodeAnalysisCSharpPackageVersion>
122-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-2.21358.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
123-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-2.21358.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
126+
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-3.21366.3</MicrosoftNetCompilersToolsetPackageVersion>
127+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-3.21366.3</MicrosoftCodeAnalysisCSharpPackageVersion>
128+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-3.21366.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
129+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-3.21366.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
124130
</PropertyGroup>
125131
<PropertyGroup>
126132
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
127-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
128-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
129-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
130-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
131-
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
132-
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreTestHostPackageVersion>
133-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
134-
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-preview.7.21358.5</MicrosoftAspNetCoreRazorLanguageVersion>
135-
<MicrosoftCodeAnalysisRazorVersion>6.0.0-preview.7.21358.5</MicrosoftCodeAnalysisRazorVersion>
133+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
134+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
135+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
136+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
137+
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreAnalyzersPackageVersion>
138+
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreTestHostPackageVersion>
139+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
140+
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-rc.1.21366.3</MicrosoftAspNetCoreRazorLanguageVersion>
141+
<MicrosoftCodeAnalysisRazorVersion>6.0.0-rc.1.21366.3</MicrosoftCodeAnalysisRazorVersion>
136142
</PropertyGroup>
137143
<PropertyGroup>
138144
<!-- Dependencies from https://github.com/dotnet/wpf -->
139-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.0-preview.7.21351.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
145+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.0-preview.7.21365.19</MicrosoftNETSdkWindowsDesktopPackageVersion>
140146
</PropertyGroup>
141147
<PropertyGroup>
142148
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
143-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21356.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
149+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21365.17</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
144150
</PropertyGroup>
145151
<PropertyGroup Label="Manually updated">
146152
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -154,7 +160,7 @@
154160
<PropertyGroup>
155161
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
156162
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
157-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21357.3</MicrosoftDotNetXUnitExtensionsVersion>
163+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21365.11</MicrosoftDotNetXUnitExtensionsVersion>
158164
<MoqPackageVersion>4.8.2</MoqPackageVersion>
159165
</PropertyGroup>
160166
<PropertyGroup>

‎eng/build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
parameters:
22
# Agent OS identifier and used as job name
33
agentOs: ''
4+
enableRichCodeNavigation: false
5+
richCodeNavigationLanguage: 'csharp'
6+
richCodeNavigationEnvironment: 'production'
47

58
# Agent pool
69
pool: {}
@@ -24,6 +27,9 @@ jobs:
2427
- template: /eng/common/templates/job/job.yml
2528
parameters:
2629
name: ${{ parameters.agentOs }}
30+
enableRichCodeNavigation: ${{ parameters.enableRichCodeNavigation }}
31+
richCodeNavigationLanguage: ${{ parameters.richCodeNavigationLanguage }}
32+
richCodeNavigationEnvironment: ${{ parameters.richCodeNavigationEnvironment }}
2733
enableMicrobuild: true
2834
enablePublishBuildAssets: true
2935
enableTelemetry: true

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __AlpinePackages="alpine-base"
3333
__AlpinePackages+=" build-base"
3434
__AlpinePackages+=" linux-headers"
3535
__AlpinePackagesEdgeCommunity=" lldb-dev"
36-
__AlpinePackagesEdgeMain=" llvm10-libs"
3736
__AlpinePackagesEdgeMain+=" python3"
3837
__AlpinePackagesEdgeMain+=" libedit"
3938

@@ -115,6 +114,8 @@ while :; do
115114
__UbuntuArch=s390x
116115
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
117116
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
117+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
118+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
118119
unset __LLDB_Package
119120
;;
120121
x86)
@@ -191,6 +192,8 @@ while :; do
191192
__CodeName=alpine
192193
__UbuntuRepo=
193194
__AlpineVersion=3.9
195+
__AlpinePackagesEdgeMain+=" llvm11-libs"
196+
__AlpinePackagesEdgeMain+=" clang-libs"
194197
;;
195198
alpine3.13)
196199
__CodeName=alpine
@@ -201,6 +204,7 @@ while :; do
201204
__AlpinePackagesEdgeCommunity=
202205
__AlpinePackages+=$__AlpinePackagesEdgeMain
203206
__AlpinePackagesEdgeMain=
207+
__AlpinePackages+=" llvm10-libs"
204208
;;
205209
freebsd11)
206210
__FreeBSDBase="11.3-RELEASE"

0 commit comments

Comments
 (0)