Skip to content

Commit 2b22709

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-dd1d31e1-73f3-4074-8b86-31834644533d
2 parents a62484e + 926c70a commit 2b22709

File tree

5 files changed

+69
-55
lines changed

5 files changed

+69
-55
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<add key="darc-pub-dotnet-templating-e07a90b-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-4/nuget/v3/index.json" />
3030
<add key="darc-pub-dotnet-templating-e07a90b-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-3/nuget/v3/index.json" />
3131
<add key="darc-pub-dotnet-templating-e07a90b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-2/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-e07a90b-17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-17/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-e07a90b-16" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-16/nuget/v3/index.json" />
3234
<add key="darc-pub-dotnet-templating-e07a90b-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-15/nuget/v3/index.json" />
3335
<add key="darc-pub-dotnet-templating-e07a90b-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-14/nuget/v3/index.json" />
3436
<add key="darc-pub-dotnet-templating-e07a90b-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-13/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>f07a91420bec3f657153e16c9f047cf151c1179f</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24523.10">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24554.3">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
102+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24523.10">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24554.3">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
107+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24523.10">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24554.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
112+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24523.10">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24554.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
116+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24523.10">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24554.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
120+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24523.10">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24554.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
124+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24523.10">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24554.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
128+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24523.10">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24554.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
132+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24523.10">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24554.3">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>16f58fa314e7deff4b3df36c862f157609ace2b4</Sha>
136+
<Sha>26920eb85c829675ba662ad6db36a17dc591638d</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rtm.24516.19">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -379,14 +379,14 @@
379379
<Uri>https://github.com/dotnet/test-templates</Uri>
380380
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
381381
</Dependency>
382-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24523.2">
382+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24555.1">
383383
<Uri>https://github.com/dotnet/test-templates</Uri>
384-
<Sha>6be1945e663153cd1db4ccd31f6ca38e7f35330d</Sha>
384+
<Sha>1ab4caea85ef1ccdb735be3e8a908f4728daf624</Sha>
385385
</Dependency>
386386
<!-- Intermediate is necessary for source build. -->
387-
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24523.2">
387+
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24555.1">
388388
<Uri>https://github.com/dotnet/test-templates</Uri>
389-
<Sha>6be1945e663153cd1db4ccd31f6ca38e7f35330d</Sha>
389+
<Sha>1ab4caea85ef1ccdb735be3e8a908f4728daf624</Sha>
390390
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391391
</Dependency>
392392
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@@ -460,34 +460,34 @@
460460
<Uri>https://github.com/dotnet/deployment-tools</Uri>
461461
<Sha>7871ee378dce87b64d930d4f33dca9c888f4034d</Sha>
462462
</Dependency>
463-
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24522.2">
463+
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24554.2">
464464
<Uri>https://github.com/dotnet/sourcelink</Uri>
465-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
465+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
466466
</Dependency>
467-
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24522.2">
467+
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24554.2">
468468
<Uri>https://github.com/dotnet/sourcelink</Uri>
469-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
469+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
470470
</Dependency>
471-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24522.2">
471+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24554.2">
472472
<Uri>https://github.com/dotnet/sourcelink</Uri>
473-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
473+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
474474
</Dependency>
475-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24522.2">
475+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24554.2">
476476
<Uri>https://github.com/dotnet/sourcelink</Uri>
477-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
477+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
478478
</Dependency>
479-
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24522.2">
479+
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24554.2">
480480
<Uri>https://github.com/dotnet/sourcelink</Uri>
481-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
481+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
482482
</Dependency>
483-
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24522.2">
483+
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24554.2">
484484
<Uri>https://github.com/dotnet/sourcelink</Uri>
485-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
485+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
486486
</Dependency>
487487
<!-- Intermediate is necessary for source build. -->
488-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24522.2">
488+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24554.2">
489489
<Uri>https://github.com/dotnet/sourcelink</Uri>
490-
<Sha>1f252d795c563515fe55a228f499e399b915363f</Sha>
490+
<Sha>30158dbab8aa11592c27561d9710cd7e5239ea3c</Sha>
491491
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
492492
</Dependency>
493493
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>00</VersionFeature>
9+
<VersionFeature>01</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -98,7 +98,7 @@
9898
<PropertyGroup>
9999
<!-- Dependency from https://github.com/dotnet/test-templates -->
100100
<!-- Supported versions -->
101-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24523.2</MicrosoftDotNetTestProjectTemplates90PackageVersion>
101+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24555.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
102102
</PropertyGroup>
103103
<PropertyGroup>
104104
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -220,14 +220,14 @@
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/dotnet/roslyn -->
223-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24523.10</MicrosoftNetCompilersToolsetVersion>
224-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24523.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
225-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisPackageVersion>
226-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisCSharpPackageVersion>
227-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
228-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
229-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24523.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
223+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24554.3</MicrosoftNetCompilersToolsetVersion>
224+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24554.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
225+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisPackageVersion>
226+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisCSharpPackageVersion>
227+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
228+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
229+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
230+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24554.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -293,12 +293,12 @@
293293
</PropertyGroup>
294294
<PropertyGroup>
295295
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
296-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24522.2</MicrosoftBuildTasksGitVersion>
297-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24522.2</MicrosoftSourceLinkCommonVersion>
298-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24522.2</MicrosoftSourceLinkAzureReposGitVersion>
299-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24522.2</MicrosoftSourceLinkGitHubVersion>
300-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24522.2</MicrosoftSourceLinkGitLabVersion>
301-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24522.2</MicrosoftSourceLinkBitbucketGitVersion>
296+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24554.2</MicrosoftBuildTasksGitVersion>
297+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24554.2</MicrosoftSourceLinkCommonVersion>
298+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24554.2</MicrosoftSourceLinkAzureReposGitVersion>
299+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24554.2</MicrosoftSourceLinkGitHubVersion>
300+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24554.2</MicrosoftSourceLinkGitLabVersion>
301+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24554.2</MicrosoftSourceLinkBitbucketGitVersion>
302302
</PropertyGroup>
303303
<!-- Get .NET Framework reference assemblies from NuGet packages -->
304304
<PropertyGroup>

‎test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,17 @@ public override CommandResult Execute(IEnumerable<string> args)
133133
args = new[] { "/restore" }.Concat(args);
134134
}
135135

136-
return base.Execute(args);
136+
var command = base.Execute(args);
137+
138+
var error = command.StdErr.ToString();
139+
var output = command.StdOut.ToString();
140+
if ((!String.IsNullOrEmpty(error) && error.Contains("NU3003")) || (!String.IsNullOrEmpty(output) && output.Contains("NU3003")))
141+
{
142+
args = args.Concat(new[] { "-v:diag" });
143+
command = base.Execute(args);
144+
}
145+
146+
return command;
137147
}
138148

139149
public CommandResult ExecuteWithoutRestore(IEnumerable<string> args)

‎test/Microsoft.NET.TestFramework/Utilities/TerminalLoggerStringExtensions.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public static string StripTerminalLoggerProgressIndicators(this string stdout)
1212
{
1313
return stdout
1414
.Replace("\x1b]9;4;3;\x1b\\", "") // indeterminate progress start
15-
.Replace("\x1b]9;4;0;\x1b\\", ""); // indeterminate progress end
15+
.Replace("\x1b]9;4;0;\x1b\\", "") // indeterminate progress end
16+
.Replace("\x1b[?25l", "") // make cursor invisble
17+
.Replace("\x1b[?25h", ""); // make cursor visible
1618
}
17-
}
19+
}

0 commit comments

Comments
 (0)