Skip to content

Commit df69ef7

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.2xx
2 parents f1cf952 + 0cdf9e8 commit df69ef7

File tree

7 files changed

+68
-48
lines changed

7 files changed

+68
-48
lines changed

‎.vsts-ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ parameters:
2222
displayName: Run A Test Build
2323
type: boolean
2424
default: false
25+
- name: enableArm64Job
26+
displayName: Enables the ARM64 job
27+
type: boolean
28+
default: false
2529

2630
variables:
2731
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -101,7 +105,7 @@ extends:
101105
templateFolderName: templates-official
102106
publishTaskPrefix: 1ES.
103107
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
104-
locBranch: release/9.0.2xx
108+
locBranch: release/9.0.3xx
105109
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
106110
timeoutInMinutes: 90
107111
windowsJobParameterSets:
@@ -289,7 +293,7 @@ extends:
289293
officialBuildProperties: $(_officialBuildProperties)
290294
runTests: false
291295
### ARM64 TESTBUILD ###
292-
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
296+
- ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}:
293297
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
294298
parameters:
295299
pool:

‎.vsts-pr.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ pr:
99
- release/*
1010
- internal/release/*
1111

12+
parameters:
13+
- name: enableArm64Job
14+
displayName: Enables the ARM64 job
15+
type: boolean
16+
default: false
17+
1218
variables:
1319
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
1420
# Variables used: DncEngPublicBuildPool
@@ -59,17 +65,18 @@ stages:
5965
os: macOS
6066
helixTargetQueue: osx.13.amd64.open
6167
### ARM64 ###
62-
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
63-
parameters:
64-
pool:
65-
name: Azure Pipelines
66-
vmImage: macOS-latest
67-
os: macOS
68-
helixTargetQueue: osx.13.arm64.open
69-
macOSJobParameterSets:
70-
- categoryName: TestBuild
71-
buildArchitecture: arm64
72-
runtimeIdentifier: osx-arm64
68+
- ${{ if eq(parameters.enableArm64Job, true) }}:
69+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
70+
parameters:
71+
pool:
72+
name: Azure Pipelines
73+
vmImage: macOS-latest
74+
os: macOS
75+
helixTargetQueue: osx.13.arm64.open
76+
macOSJobParameterSets:
77+
- categoryName: TestBuild
78+
buildArchitecture: arm64
79+
runtimeIdentifier: osx-arm64
7380

7481
############### SOURCE BUILD ###############
7582
- template: /eng/common/templates/job/source-build.yml

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
<Sha>3d780e06fbae1bc106cb90088fa9605ea4a42eed</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25105.4">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25105.14">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
98+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25105.4">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25105.14">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
103+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25105.4">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25105.14">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
108+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25105.4">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25105.14">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
112+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25105.4">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25105.14">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
116+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25105.4">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25105.14">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
120+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25105.4">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25105.14">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
124+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25105.4">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25105.14">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
128+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25105.4">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25105.14">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>400efa2d94b217101a0ca61e84a3812fdc2fec52</Sha>
132+
<Sha>398fa9b7175f642be13efcda93c6ab1187934a6a</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.1-rtm.24610.9">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,14 @@
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/dotnet/roslyn -->
205-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25105.4</MicrosoftNetCompilersToolsetVersion>
206-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25105.4</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisPackageVersion>
208-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisCSharpPackageVersion>
209-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25105.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
205+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25105.14</MicrosoftNetCompilersToolsetVersion>
206+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25105.14</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisPackageVersion>
208+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisCSharpPackageVersion>
209+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25105.14</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
215215
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using Microsoft.DotNet.Cli;
55
using Microsoft.DotNet.Cli.Utils;
6+
using Microsoft.DotNet.Tools.Common;
67

78
namespace Microsoft.DotNet.Tools.Sln
89
{
@@ -29,7 +30,7 @@ public static void ParseAndValidateArguments(string _fileOrDirectory, IReadOnlyC
2930
throw new GracefulException(LocalizableStrings.SolutionFolderAndInRootMutuallyExclusive);
3031
}
3132

32-
var slnFile = _arguments.FirstOrDefault(path => path.EndsWith(".sln"));
33+
var slnFile = _arguments.FirstOrDefault(path => path.HasExtension(".sln") || path.HasExtension(".slnx"));
3334
if (slnFile != null)
3435
{
3536
string args;
@@ -46,7 +47,7 @@ public static void ParseAndValidateArguments(string _fileOrDirectory, IReadOnlyC
4647
args = "";
4748
}
4849

49-
var projectArgs = string.Join(" ", _arguments.Where(path => !path.EndsWith(".sln")));
50+
var projectArgs = string.Join(" ", _arguments.Where(path => !path.HasExtension(".sln") && !path.HasExtension(".slnx")));
5051
string command = commandType == CommandType.Add ? "add" : "remove";
5152
throw new GracefulException(new string[]
5253
{

‎test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,8 @@ private string GetExpectedSlnContents(
11531153
[Theory]
11541154
[InlineData("sln", ".sln")]
11551155
[InlineData("solution", ".sln")]
1156+
[InlineData("sln", ".slnx")]
1157+
[InlineData("solution", ".slnx")]
11561158
public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand, string solutionExtension)
11571159
{
11581160
VerifySuggestionAndUsage(solutionCommand, "", solutionExtension);
@@ -1161,6 +1163,8 @@ public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solut
11611163
[Theory]
11621164
[InlineData("sln", ".sln")]
11631165
[InlineData("solution", ".sln")]
1166+
[InlineData("sln", ".slnx")]
1167+
[InlineData("solution", ".slnx")]
11641168
public void WhenSolutionIsPassedAsProjectWithInRootItPrintsSuggestionAndUsage(string solutionCommand, string solutionExtension)
11651169
{
11661170
VerifySuggestionAndUsage(solutionCommand, "--in-root", solutionExtension);
@@ -1169,6 +1173,8 @@ public void WhenSolutionIsPassedAsProjectWithInRootItPrintsSuggestionAndUsage(st
11691173
[Theory]
11701174
[InlineData("sln", ".sln")]
11711175
[InlineData("solution", ".sln")]
1176+
[InlineData("sln", ".slnx")]
1177+
[InlineData("solution", ".slnx")]
11721178
public void WhenSolutionIsPassedAsProjectWithSolutionFolderItPrintsSuggestionAndUsage(string solutionCommand, string solutionExtension)
11731179
{
11741180
VerifySuggestionAndUsage(solutionCommand, "--solution-folder", solutionExtension);

‎test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -627,24 +627,26 @@ public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved(string s
627627
}
628628

629629
[Theory]
630-
[InlineData("sln")]
631-
[InlineData("solution")]
632-
public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand)
630+
[InlineData("sln", ".sln")]
631+
[InlineData("solution", ".sln")]
632+
[InlineData("sln", ".slnx")]
633+
[InlineData("solution", ".slnx")]
634+
public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand, string solutionExtension)
633635
{
634636
var projectDirectory = _testAssetsManager
635-
.CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}")
637+
.CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}{solutionExtension}")
636638
.WithSource()
637639
.Path;
638640

639641
var projectArg = Path.Combine("Lib", "Lib.csproj");
640642
var cmd = new DotnetCommand(Log)
641643
.WithWorkingDirectory(projectDirectory)
642-
.Execute(solutionCommand, "remove", "App.sln", projectArg);
644+
.Execute(solutionCommand, "remove", $"App{solutionExtension}", projectArg);
643645
cmd.Should().Fail();
644646
cmd.StdErr.Should().BeVisuallyEquivalentTo(
645-
string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, "App.sln") + Environment.NewLine
647+
string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, $"App{solutionExtension}") + Environment.NewLine
646648
+ CommonLocalizableStrings.DidYouMean + Environment.NewLine
647-
+ $" dotnet solution App.sln remove {projectArg}"
649+
+ $" dotnet solution App{solutionExtension} remove {projectArg}"
648650
);
649651
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized("");
650652
}

0 commit comments

Comments
 (0)