Skip to content

Commit 5205550

Browse files
CosifneCosifne
committed
Merge remote-tracking branch 'dnceng/internal/release/6.0.4xx' into dev/shech/UpdateFormat6.0.10
2 parents bd08383 + 0f7bfed commit 5205550

File tree

8 files changed

+52
-62
lines changed

8 files changed

+52
-62
lines changed

‎.vsts-ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ extends:
112112
pool:
113113
${{ if eq(variables['System.TeamProject'], 'public') }}:
114114
name: NetCore-Svc-Public
115-
image: 1es-windows-2022-open
116-
os: windows
115+
demands: ImageOverride -equals windows.vs2022preview.amd64.open
117116
${{ if ne(variables['System.TeamProject'], 'public') }}:
118117
name: NetCore1ESPool-Svc-Internal
119-
image: 1es-windows-2022
120-
os: windows
118+
demands: ImageOverride -equals windows.vs2022preview.amd64
121119
${{ if eq(variables['System.TeamProject'], 'public') }}:
122120
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
123121
${{ if ne(variables['System.TeamProject'], 'public') }}:

‎NuGet.config

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@
1515
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
1616
<!-- End: Package sources from dotnet-runtime -->
1717
<!-- Begin: Package sources from dotnet-templating -->
18-
<add key="darc-int-dotnet-templating-1a1d03f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-templating-1a1d03f-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-5/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-templating-1a1d03f-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-4/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-templating-1a1d03f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-3/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-templating-1a1d03f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-2/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-templating-1a1d03f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-1/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
2419
<!-- End: Package sources from dotnet-templating -->
2520
<!-- Begin: Package sources from dotnet-windowsdesktop -->
26-
<add key="darc-int-dotnet-windowsdesktop-01c5bea" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-01c5bea2/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
2722
<!-- End: Package sources from dotnet-windowsdesktop -->
2823
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2924
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -43,12 +38,7 @@
4338
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4439
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4540
<!-- Begin: Package sources from dotnet-templating -->
46-
<add key="darc-int-dotnet-templating-1a1d03f-1" value="true" />
47-
<add key="darc-int-dotnet-templating-1a1d03f-2" value="true" />
48-
<add key="darc-int-dotnet-templating-1a1d03f-3" value="true" />
49-
<add key="darc-int-dotnet-templating-1a1d03f-4" value="true" />
50-
<add key="darc-int-dotnet-templating-1a1d03f-5" value="true" />
51-
<add key="darc-int-dotnet-templating-1a1d03f" value="true" />
41+
<add key="darc-int-dotnet-templating-7de8a28" value="true" />
5242
<!-- End: Package sources from dotnet-templating -->
5343
<!-- Begin: Package sources from dotnet-aspnetcore -->
5444
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
@@ -57,7 +47,7 @@
5747
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
5848
<!-- End: Package sources from dotnet-runtime -->
5949
<!-- Begin: Package sources from dotnet-windowsdesktop -->
60-
<add key="darc-int-dotnet-windowsdesktop-01c5bea" value="true" />
50+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
6151
<!-- End: Package sources from dotnet-windowsdesktop -->
6252
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6353
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.425-rtm.24417.1">
4+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.427-rtm.24466.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
6-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
6+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
77
<SourceBuild RepoName="templating" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="6.0.425">
9+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="6.0.427">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
11-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
11+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="6.0.425">
13+
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="6.0.427">
1414
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
15-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
15+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="6.0.425">
17+
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="6.0.427">
1818
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
19-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
19+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.TemplateSearch.Common" Version="6.0.425">
21+
<Dependency Name="Microsoft.TemplateSearch.Common" Version="6.0.427">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
23-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
23+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.425">
25+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.427">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
27-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
27+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.425">
29+
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.427">
3030
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
31-
<Sha>1a1d03fbcbcf9d373c1f0c87c20506b5de300388</Sha>
31+
<Sha>7de8a2867cf734967eef78d8e82902f3e84650b7</Sha>
3232
</Dependency>
3333
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35">
3434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -176,23 +176,23 @@
176176
</Dependency>
177177
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.35">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
179+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.35-servicing.24462.8">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.35-servicing.24463.5">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
183+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
184184
</Dependency>
185-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.35-servicing.24462.8">
185+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.35-servicing.24463.5">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
187+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.35">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
191-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
191+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
192192
</Dependency>
193-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
193+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
195-
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
195+
<Sha>c9e44425226553e639116ff82698cfd2808f7769</Sha>
196196
</Dependency>
197197
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.35">
198198
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -299,22 +299,22 @@
299299
</Dependency>
300300
</ProductDependencies>
301301
<ToolsetDependencies>
302-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
302+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
303303
<Uri>https://github.com/dotnet/arcade</Uri>
304-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
304+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
305305
<SourceBuild RepoName="arcade" ManagedOnly="true" />
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
307+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
309+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
310310
</Dependency>
311-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24413.1">
311+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24459.5">
312312
<Uri>https://github.com/dotnet/arcade</Uri>
313-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
313+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
314314
</Dependency>
315-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24413.1">
315+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24459.5">
316316
<Uri>https://github.com/dotnet/arcade</Uri>
317-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
317+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
318318
</Dependency>
319319
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
320320
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3131
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3232
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
33-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24413.1</MicrosoftDotNetSignToolVersion>
33+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24459.5</MicrosoftDotNetSignToolVersion>
3434
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -119,11 +119,11 @@
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependencies from https://github.com/dotnet/templating -->
122-
<MicrosoftTemplateEngineCliPackageVersion>6.0.425-rtm.24417.1</MicrosoftTemplateEngineCliPackageVersion>
123-
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.425</MicrosoftTemplateEngineAbstractionsPackageVersion>
124-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.425</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
125-
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.425</MicrosoftTemplateEngineUtilsPackageVersion>
126-
<MicrosoftTemplateSearchCommonPackageVersion>6.0.425</MicrosoftTemplateSearchCommonPackageVersion>
122+
<MicrosoftTemplateEngineCliPackageVersion>6.0.427-rtm.24466.3</MicrosoftTemplateEngineCliPackageVersion>
123+
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.427</MicrosoftTemplateEngineAbstractionsPackageVersion>
124+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.427</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
125+
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.427</MicrosoftTemplateEngineUtilsPackageVersion>
126+
<MicrosoftTemplateSearchCommonPackageVersion>6.0.427</MicrosoftTemplateSearchCommonPackageVersion>
127127
</PropertyGroup>
128128
<PropertyGroup>
129129
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
@@ -152,11 +152,11 @@
152152
</PropertyGroup>
153153
<PropertyGroup>
154154
<!-- Dependencies from https://github.com/dotnet/wpf -->
155-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.35-servicing.24462.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
155+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.35-servicing.24462.14</MicrosoftNETSdkWindowsDesktopPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
159-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.35-servicing.24462.8</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
159+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.35-servicing.24463.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
160160
</PropertyGroup>
161161
<PropertyGroup Label="Manually updated">
162162
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -175,7 +175,7 @@
175175
<PropertyGroup>
176176
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
177177
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
178-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24413.1</MicrosoftDotNetXUnitExtensionsVersion>
178+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24459.5</MicrosoftDotNetXUnitExtensionsVersion>
179179
<MoqPackageVersion>4.8.2</MoqPackageVersion>
180180
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
181181
</PropertyGroup>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",
15-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
15+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
1616
}
1717
}

‎src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati
136136
public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation()
137137
{
138138
var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build");
139-
Assert.Equal("xdg-open", proc.StartInfo.FileName);
139+
Assert.Contains("xdg-open", proc.StartInfo.FileName);
140140
Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments);
141141

142142
}

‎src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
112112
.StartWith(firstTimeNonVerbUseMessage);
113113
}
114114

115-
[WindowsOnlyFact]
115+
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
116116
public void ItShowsTheAppropriateMessageToTheUser()
117117
{
118118

@@ -160,7 +160,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
160160
homeFolder.Should().NotExist();
161161
}
162162

163-
[WindowsOnlyFact]
163+
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
164164
public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
165165
{
166166
var dotnetFirstTime = new DotNetFirstTime();

‎src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_
7171

7272
var cmd = new DotnetCommand(Log)
7373
.WithWorkingDirectory(testInstance.Path)
74+
.WithEnvironmentVariable("HelixAccessToken", "")
75+
.WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "")
7476
.Execute(command, "-v", "diag");
7577

7678
cmd.Should().Pass();

0 commit comments

Comments
 (0)