Skip to content

Commit 56537bd

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into merge/release/9.0.3xx-to-main
2 parents afeaada + 35a8299 commit 56537bd

File tree

142 files changed

+23109
-1390
lines changed

Some content is hidden

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

142 files changed

+23109
-1390
lines changed

‎eng/Version.Details.xml

Lines changed: 166 additions & 162 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
2929
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3030
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
31+
<!-- This property is only used in the dotnet test integration tests. -->
3132
<MicrosoftTestingPlatformVersion>1.6.0-preview.25072.4</MicrosoftTestingPlatformVersion>
3233
</PropertyGroup>
3334
<PropertyGroup Label="Servicing version information">
@@ -83,7 +84,7 @@
8384
</PropertyGroup>
8485
<PropertyGroup>
8586
<!-- Dependency from https://github.com/dotnet/winforms -->
86-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25071.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
87+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25072.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8788
</PropertyGroup>
8889
<PropertyGroup>
8990
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -136,39 +137,39 @@
136137
</PropertyGroup>
137138
<PropertyGroup>
138139
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
139-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25072.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
140-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25072.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
141-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25072.2</MicrosoftWindowsDesktopAppRefPackageVersion>
140+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25073.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
141+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
142+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRefPackageVersion>
142143
</PropertyGroup>
143144
<PropertyGroup>
144145
<!-- Dependencies from https://github.com/nuget/nuget.client -->
145-
<NuGetBuildTasksPackageVersion>6.13.0-rc.113</NuGetBuildTasksPackageVersion>
146-
<NuGetBuildTasksConsolePackageVersion>6.13.0-rc.113</NuGetBuildTasksConsolePackageVersion>
147-
<NuGetLocalizationPackageVersion>6.13.0-rc.113</NuGetLocalizationPackageVersion>
148-
<NuGetBuildTasksPackPackageVersion>6.13.0-rc.113</NuGetBuildTasksPackPackageVersion>
149-
<NuGetCommandLineXPlatPackageVersion>6.13.0-rc.113</NuGetCommandLineXPlatPackageVersion>
150-
<NuGetProjectModelPackageVersion>6.13.0-rc.113</NuGetProjectModelPackageVersion>
151-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-rc.113</MicrosoftBuildNuGetSdkResolverPackageVersion>
152-
<NuGetCommonPackageVersion>6.13.0-rc.113</NuGetCommonPackageVersion>
153-
<NuGetConfigurationPackageVersion>6.13.0-rc.113</NuGetConfigurationPackageVersion>
154-
<NuGetFrameworksPackageVersion>6.13.0-rc.113</NuGetFrameworksPackageVersion>
155-
<NuGetPackagingPackageVersion>6.13.0-rc.113</NuGetPackagingPackageVersion>
156-
<NuGetVersioningPackageVersion>6.13.0-rc.113</NuGetVersioningPackageVersion>
146+
<NuGetBuildTasksPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackageVersion>
147+
<NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.11</NuGetBuildTasksConsolePackageVersion>
148+
<NuGetLocalizationPackageVersion>6.14.0-preview.1.11</NuGetLocalizationPackageVersion>
149+
<NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackPackageVersion>
150+
<NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.11</NuGetCommandLineXPlatPackageVersion>
151+
<NuGetProjectModelPackageVersion>6.14.0-preview.1.11</NuGetProjectModelPackageVersion>
152+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.11</MicrosoftBuildNuGetSdkResolverPackageVersion>
153+
<NuGetCommonPackageVersion>6.14.0-preview.1.11</NuGetCommonPackageVersion>
154+
<NuGetConfigurationPackageVersion>6.14.0-preview.1.11</NuGetConfigurationPackageVersion>
155+
<NuGetFrameworksPackageVersion>6.14.0-preview.1.11</NuGetFrameworksPackageVersion>
156+
<NuGetPackagingPackageVersion>6.14.0-preview.1.11</NuGetPackagingPackageVersion>
157+
<NuGetVersioningPackageVersion>6.14.0-preview.1.11</NuGetVersioningPackageVersion>
157158
</PropertyGroup>
158159
<PropertyGroup>
159160
<!-- Dependencies from https://github.com/Microsoft/vstest -->
160-
<MicrosoftNETTestSdkPackageVersion>17.13.0-preview-25060-03</MicrosoftNETTestSdkPackageVersion>
161-
<MicrosoftTestPlatformCLIPackageVersion>17.13.0-preview-25060-03</MicrosoftTestPlatformCLIPackageVersion>
162-
<MicrosoftTestPlatformBuildPackageVersion>17.13.0-preview-25060-03</MicrosoftTestPlatformBuildPackageVersion>
161+
<MicrosoftNETTestSdkPackageVersion>17.14.0-preview-25073-07</MicrosoftNETTestSdkPackageVersion>
162+
<MicrosoftTestPlatformCLIPackageVersion>17.14.0-preview-25073-07</MicrosoftTestPlatformCLIPackageVersion>
163+
<MicrosoftTestPlatformBuildPackageVersion>17.14.0-preview-25073-07</MicrosoftTestPlatformBuildPackageVersion>
163164
</PropertyGroup>
164165
<PropertyGroup>
165166
<!-- Dependencies from https://github.com/Microsoft/testfx -->
166167
<MicrosoftTestingPlatformVersion>1.5.0-preview.24602.2</MicrosoftTestingPlatformVersion>
167168
</PropertyGroup>
168169
<PropertyGroup>
169170
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
170-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25072.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
171-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25072.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
171+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25073.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
172+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25073.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
172173
</PropertyGroup>
173174
<PropertyGroup>
174175
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -196,13 +197,13 @@
196197
</PropertyGroup>
197198
<PropertyGroup>
198199
<!-- Dependencies from https://github.com/dotnet/templating -->
199-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25071.3</MicrosoftTemplateEngineAbstractionsPackageVersion>
200+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25073.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
200201
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
201202
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
202203
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
203204
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
204205
<!-- test dependencies -->
205-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25071.3</MicrosoftTemplateEngineMocksPackageVersion>
206+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25073.1</MicrosoftTemplateEngineMocksPackageVersion>
206207
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
207208
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
208209
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -219,35 +220,36 @@
219220
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisCSharpPackageVersion>
220221
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
221222
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
223+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
222224
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
223225
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-1.25070.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
224226
</PropertyGroup>
225227
<PropertyGroup>
226228
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
227-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreAppRefPackageVersion>
228-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
229-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
230-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
231-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
232-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
233-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreTestHostPackageVersion>
234-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
235-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25072.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
236-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25072.6</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
237-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25072.6</dotnetdevcertsPackageVersion>
238-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25072.6</dotnetuserjwtsPackageVersion>
239-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25072.6</dotnetusersecretsPackageVersion>
229+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRefPackageVersion>
230+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
231+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
232+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
233+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
234+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
235+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreTestHostPackageVersion>
236+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
237+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25073.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
238+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25073.4</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
239+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25073.4</dotnetdevcertsPackageVersion>
240+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25073.4</dotnetuserjwtsPackageVersion>
241+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25073.4</dotnetusersecretsPackageVersion>
240242
</PropertyGroup>
241243
<PropertyGroup>
242244
<!-- Dependencies from https://github.com/dotnet/razor -->
243-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25071.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
244-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25071.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
245-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25071.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
245+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25073.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
246+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25073.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
247+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25073.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
246248
</PropertyGroup>
247249
<PropertyGroup>
248250
<!-- Dependencies from https://github.com/dotnet/wpf -->
249-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25072.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
250-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25072.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
251+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
252+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
251253
</PropertyGroup>
252254
<PropertyGroup Label="Template versions">
253255
<!-- 10.0 Template versions -->
@@ -266,19 +268,19 @@
266268
</PropertyGroup>
267269
<PropertyGroup>
268270
<!-- Dependencies from https://github.com/dotnet/arcade -->
269-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25072.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
270-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25072.2</MicrosoftDotNetSignToolVersion>
271-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25072.2</MicrosoftDotNetXliffTasksVersion>
272-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25072.2</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25073.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25073.5</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25073.5</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25073.5</MicrosoftDotNetXUnitExtensionsVersion>
273275
</PropertyGroup>
274276
<PropertyGroup>
275277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
276-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.25070.1</MicrosoftBuildTasksGitVersion>
277-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.25070.1</MicrosoftSourceLinkCommonVersion>
278-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.25070.1</MicrosoftSourceLinkAzureReposGitVersion>
279-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.25070.1</MicrosoftSourceLinkGitHubVersion>
280-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.25070.1</MicrosoftSourceLinkGitLabVersion>
281-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.25070.1</MicrosoftSourceLinkBitbucketGitVersion>
278+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.25072.1</MicrosoftBuildTasksGitVersion>
279+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkCommonVersion>
280+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkAzureReposGitVersion>
281+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkGitHubVersion>
282+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkGitLabVersion>
283+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkBitbucketGitVersion>
282284
</PropertyGroup>
283285
<PropertyGroup>
284286
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,13 @@ jobs:
142142

143143
${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}:
144144
${{ if eq(parameters.buildPass, '') }}:
145-
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
145+
# For PR builds, skip the stage 2 build if the stage 1 build fails.
146+
# Otherwise, run the stage 2 build even if the stage 1 build fails so that we can get a complete assessment of the build status.
146147
# The build shortcuts when stage 1 build fails and doesn't produce the SDK.
147-
condition: succeededOrFailed()
148+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
149+
condition: succeeded()
150+
${{ else }}:
151+
condition: succeededOrFailed()
148152
${{ else }}:
149153
condition: succeeded()
150154
dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.24573.1",
3+
"dotnet": "10.0.100-alpha.1.25073.3",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25072.2",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25072.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25073.5",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25073.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Cli/Microsoft.DotNet.Cli.Utils/PathUtility.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System.Text.RegularExpressions;
45
using Microsoft.DotNet.Cli.Utils;
56
using NuGet.Configuration;
67

@@ -388,5 +389,15 @@ public static void EnsureAllPathsExist(
388389

389390
public static bool IsDirectory(this string path) =>
390391
File.GetAttributes(path).HasFlag(FileAttributes.Directory);
392+
393+
public static string FixFilePath(string path)
394+
{
395+
return string.IsNullOrEmpty(path) || Path.DirectorySeparatorChar == '\\' ? path : path.Replace('\\', '/');
396+
}
397+
398+
public static string GetDirectorySeparatorChar()
399+
{
400+
return Regex.Escape(Path.DirectorySeparatorChar.ToString());
401+
}
391402
}
392403
}

‎src/Cli/dotnet/commands/dotnet-test/CliConstants.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ internal static class CliConstants
2222

2323
public const string TestSectionKey = "test";
2424

25-
public const string RestoreCommand = "restore";
25+
public const string RestoreCommand = "Restore";
26+
public const string BuildCommand = "Build";
27+
public const string Configuration = "Configuration";
28+
public const string RuntimeIdentifier = "RuntimeIdentifier";
2629

2730
public static readonly string[] ProjectExtensions = { ".proj", ".csproj", ".vbproj", ".fsproj" };
2831
public static readonly string[] SolutionExtensions = { ".sln", ".slnx" };

0 commit comments

Comments
 (0)