Skip to content

Commit 6dc6fcb

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 227a98d + 4529d66 commit 6dc6fcb

14 files changed

+36
-31
lines changed

‎eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ and are generated based on the last package release.
163163

164164
<ItemGroup Label="External dependencies" Condition="'$(DotNetBuildFromSource)' != 'true'">
165165
<LatestPackageReference Include="AngleSharp" />
166+
<LatestPackageReference Include="Azure.Identity" />
166167
<LatestPackageReference Include="BenchmarkDotNet" />
167168
<LatestPackageReference Include="CommandLineParser" />
168169
<LatestPackageReference Include="Duende.IdentityServer" />

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
223223
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
224224
<!-- 3rd party dependencies -->
225+
<AzureIdentityVersion>1.10.2</AzureIdentityVersion>
225226
<AngleSharpVersion>0.9.9</AngleSharpVersion>
226227
<BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion>
227228
<CastleCoreVersion>4.2.1</CastleCoreVersion>

‎src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<Reference Include="Microsoft.Extensions.Caching.Abstractions" />
2121
<Reference Include="Microsoft.Extensions.Options" />
2222
<Reference Include="Microsoft.Data.SqlClient" />
23+
<Reference Include="Azure.Identity" />
2324
</ItemGroup>
2425

2526
</Project>

‎src/ProjectTemplates/test/BlazorWasmTemplateTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,26 @@ private void ValidatePublishedServiceWorker(Project project)
7777
}
7878

7979
[ConditionalFact]
80-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = "Windows.10.Arm64v8.Open")]
80+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = HelixConstants.Windows11Arm64)]
8181
// LocalDB doesn't work on non Windows platforms
8282
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
8383
public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithLocalDB()
8484
=> BlazorWasmHostedTemplate_IndividualAuth_Works(true, false);
8585

8686
[ConditionalFact]
87-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = "Windows.10.Arm64v8.Open")]
87+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = HelixConstants.Windows11Arm64)]
8888
public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithOutLocalDB()
8989
=> BlazorWasmHostedTemplate_IndividualAuth_Works(false, false);
9090

9191
[ConditionalFact]
92-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = "Windows.10.Arm64v8.Open")]
92+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = HelixConstants.Windows11Arm64)]
9393
// LocalDB doesn't work on non Windows platforms
9494
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
9595
public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithLocalDB_ProgramMain()
9696
=> BlazorWasmHostedTemplate_IndividualAuth_Works(true, true);
9797

9898
[ConditionalFact]
99-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = "Windows.10.Arm64v8.Open")]
99+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/34554", Queues = HelixConstants.Windows11Arm64)]
100100
public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithOutLocalDB_ProgramMain()
101101
=> BlazorWasmHostedTemplate_IndividualAuth_Works(false, true);
102102

‎src/ProjectTemplates/test/EmptyWebTemplateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public ITestOutputHelper Output
3232
}
3333

3434
[ConditionalFact]
35-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
35+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
3636
public async Task EmptyWebTemplateCSharp()
3737
{
3838
await EmtpyTemplateCore(languageOverride: null);
3939
}
4040

4141
[ConditionalFact]
42-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
42+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
4343
public async Task EmptyWebTemplateProgramMainCSharp()
4444
{
4545
await EmtpyTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });

‎src/ProjectTemplates/test/GrpcTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
3535
}
3636

3737
[ConditionalTheory]
38-
[SkipOnHelix("Not supported queues", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
38+
[SkipOnHelix("Not supported queues", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
3939
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")]
4040
[InlineData(true)]
4141
[InlineData(false)]

‎src/ProjectTemplates/test/IdentityUIPackageTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public ITestOutputHelper Output
9898
};
9999

100100
[ConditionalFact]
101-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
101+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
102102
public async Task IdentityUIPackage_WorksWithDifferentOptions()
103103
{
104104
var packageOptions = new Dictionary<string, string>();

‎src/ProjectTemplates/test/MvcTemplateTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public ITestOutputHelper Output
4040
public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");
4141

4242
[ConditionalFact]
43-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
43+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
4444
public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
4545

4646
[ConditionalFact]
47-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
47+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
4848
public async Task MvcTemplate_ProgramMainNoAuthCSharp() => await MvcTemplateCore(languageOverride: null, new [] { ArgConstants.UseProgramMain });
4949

5050
private async Task MvcTemplateCore(string languageOverride, string[] args = null)
@@ -122,14 +122,14 @@ private async Task MvcTemplateCore(string languageOverride, string[] args = null
122122
[ConditionalTheory]
123123
[InlineData(false)]
124124
[InlineData(true)]
125-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
125+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
126126
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
127127
public Task MvcTemplate_IndividualAuth_LocalDb(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
128128

129129
[ConditionalTheory]
130130
[InlineData(false)]
131131
[InlineData(true)]
132-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
132+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
133133
public Task MvcTemplate_IndividualAuth(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
134134

135135
private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
@@ -250,7 +250,7 @@ private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProg
250250

251251
[ConditionalFact]
252252
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] // Running these requires the rid-specific runtime pack to be available which is not consistent in all our platform builds.
253-
[SkipOnHelix("cert failure", Queues = "All.OSX;" + HelixConstants.Windows10Arm64)]
253+
[SkipOnHelix("cert failure", Queues = "All.OSX;" + HelixConstants.Windows11Arm64)]
254254
public async Task MvcTemplate_SingleFileExe()
255255
{
256256
// This test verifies publishing an MVC app as a single file exe works. We'll limit testing
@@ -297,15 +297,15 @@ public async Task MvcTemplate_SingleFileExe()
297297
}
298298

299299
[ConditionalTheory]
300-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
300+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
301301
[InlineData("IndividualB2C", null)]
302302
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain })]
303303
[InlineData("IndividualB2C", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
304304
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
305305
public Task MvcTemplate_IdentityWeb_IndividualB2C_BuildsAndPublishes(string auth, string[] args) => MvcTemplateBuildsAndPublishes(auth: auth, args: args);
306306

307307
[ConditionalTheory]
308-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
308+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
309309
[InlineData("SingleOrg", null)]
310310
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain })]
311311
[InlineData("SingleOrg", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]

‎src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task RazorClassLibraryTemplate_WithViews_Async()
5050
}
5151

5252
[ConditionalFact]
53-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
53+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
5454
public async Task RazorClassLibraryTemplateAsync()
5555
{
5656
var project = await ProjectFactory.CreateProject(Output);

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
3535
}
3636

3737
[ConditionalTheory]
38-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
38+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
3939
[InlineData(true)]
4040
[InlineData(false)]
4141
public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
@@ -109,14 +109,14 @@ public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
109109
[ConditionalTheory]
110110
[InlineData(false)]
111111
[InlineData(true)]
112-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
112+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
113113
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
114114
public Task RazorPagesTemplate_IndividualAuth_LocalDb(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
115115

116116
[ConditionalTheory]
117117
[InlineData(false)]
118118
[InlineData(true)]
119-
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
119+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
120120
public Task RazorPagesTemplate_IndividualAuth(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
121121

122122
private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)
@@ -236,15 +236,15 @@ private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool
236236
}
237237

238238
[ConditionalTheory]
239-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
239+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
240240
[InlineData("IndividualB2C", null)]
241241
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain })]
242242
[InlineData("IndividualB2C", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
243243
[InlineData("IndividualB2C", new[] { ArgConstants.UseProgramMain, ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]
244244
public Task RazorPagesTemplate_IdentityWeb_IndividualB2C_BuildsAndPublishes(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
245245

246246
[ConditionalTheory]
247-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
247+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows11Arm64 + HelixConstants.DebianArm64)]
248248
[InlineData("SingleOrg", null)]
249249
[InlineData("SingleOrg", new[] { ArgConstants.UseProgramMain })]
250250
[InlineData("SingleOrg", new[] { ArgConstants.CalledApiUrlGraphMicrosoftCom, ArgConstants.CalledApiScopesUserReadWrite })]

0 commit comments

Comments
 (0)