Skip to content

Commit 09f4073

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 23a2e96 + 0ceffe0 commit 09f4073

File tree

9 files changed

+374
-366
lines changed

9 files changed

+374
-366
lines changed

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

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

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22212.5">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
285+
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22212.5">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
290+
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22212.5">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22254.3">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
294+
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22212.5">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22254.3">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
298+
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>6</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.6</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.6</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138
@@ -214,10 +214,10 @@
214214
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
215215
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
216216
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
217-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.24-servicing-22180-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
217+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.25-servicing-22219-10</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
218218
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
219219
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
220-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.16-servicing-22167-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
220+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
221221
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
222222
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
223223
<!-- 3rd party dependencies -->

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.104"
3+
"version": "6.0.105"
44
},
55
"tools": {
6-
"dotnet": "6.0.104",
6+
"dotnet": "6.0.105",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",
@@ -13,7 +13,7 @@
1313
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1414
],
1515
"aspnetcore/x64": [
16-
"3.1.24"
16+
"3.1.25"
1717
]
1818
},
1919
"Git": "2.22.0",
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22212.5"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22254.3"
3434
}
3535
}

‎src/Middleware/HttpLogging/src/W3CLoggerProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override async Task OnFirstWrite(StreamWriter streamWriter, CancellationT
2727
{
2828
await WriteMessageAsync("#Version: 1.0", streamWriter, cancellationToken);
2929

30-
await WriteMessageAsync("#Start-Date: " + DateTimeOffset.UtcNow.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture), streamWriter, cancellationToken);
30+
await WriteMessageAsync("#Start-Date: " + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture), streamWriter, cancellationToken);
3131

3232
await WriteMessageAsync(GetFieldsDirective(), streamWriter, cancellationToken);
3333
}

‎src/Middleware/HttpLogging/test/W3CLoggerTests.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class W3CLoggerTests
2525
public async Task WritesDateTime()
2626
{
2727
var path = Path.GetTempFileName() + "_";
28-
var now = DateTime.Now;
28+
var now = DateTime.UtcNow;
2929
var options = new W3CLoggerOptions()
3030
{
3131
LoggingFields = W3CLoggingFields.Date | W3CLoggingFields.Time,
@@ -48,7 +48,9 @@ public async Task WritesDateTime()
4848
Assert.StartsWith("#Start-Date: ", lines[1]);
4949
var startDate = DateTime.Parse(lines[1].Substring(13), CultureInfo.InvariantCulture);
5050
// Assert that the log was written in the last 10 seconds
51-
Assert.True(now.Subtract(startDate).TotalSeconds < 10);
51+
// W3CLogger writes start-time to second precision, so delta could be as low as -0.999...
52+
var delta = startDate.Subtract(now).TotalSeconds;
53+
Assert.InRange(delta, -1, 10);
5254

5355
Assert.Equal("#Fields: date time", lines[2]);
5456

@@ -89,7 +91,9 @@ public async Task HandlesNullValuesAsync()
8991
Assert.StartsWith("#Start-Date: ", lines[1]);
9092
var startDate = DateTime.Parse(lines[1].Substring(13), CultureInfo.InvariantCulture);
9193
// Assert that the log was written in the last 10 seconds
92-
Assert.True(now.Subtract(startDate).TotalSeconds < 10);
94+
// W3CLogger writes start-time to second precision, so delta could be as low as -0.999...
95+
var delta = startDate.Subtract(now).TotalSeconds;
96+
Assert.InRange(delta, -1, 10);
9397

9498
Assert.Equal("#Fields: cs-uri-query sc-status cs-host", lines[2]);
9599
Assert.Equal("- - -", lines[3]);

‎src/Middleware/HttpLogging/test/W3CLoggingMiddlewareTests.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async Task DefaultDoesNotLogOptionalFields()
9494
httpContext.Request.Headers["Cookie"] = "Snickerdoodle";
9595
httpContext.Response.StatusCode = 200;
9696

97-
var now = DateTime.Now;
97+
var now = DateTime.UtcNow;
9898
await middleware.Invoke(httpContext);
9999
await logger.Processor.WaitForWrites(4).DefaultTimeout();
100100

@@ -104,7 +104,9 @@ public async Task DefaultDoesNotLogOptionalFields()
104104
Assert.StartsWith("#Start-Date: ", lines[1]);
105105
var startDate = DateTime.Parse(lines[1].Substring(13), CultureInfo.InvariantCulture);
106106
// Assert that the log was written in the last 10 seconds
107-
Assert.True(now.Subtract(startDate).TotalSeconds < 10);
107+
// W3CLogger writes start-time to second precision, so delta could be as low as -0.999...
108+
var delta = startDate.Subtract(now).TotalSeconds;
109+
Assert.InRange(delta, -1, 10);
108110

109111
Assert.Equal("#Fields: date time c-ip s-computername s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status time-taken cs-version cs-host cs(User-Agent) cs(Referer)", lines[2]);
110112
Assert.DoesNotContain(lines[3], "Snickerdoodle");
@@ -128,7 +130,7 @@ public async Task TimeTakenIsInMilliseconds()
128130

129131
var httpContext = new DefaultHttpContext();
130132

131-
var now = DateTime.Now;
133+
var now = DateTime.UtcNow;
132134
await middleware.Invoke(httpContext);
133135
await logger.Processor.WaitForWrites(4).DefaultTimeout();
134136

@@ -138,7 +140,9 @@ public async Task TimeTakenIsInMilliseconds()
138140
Assert.StartsWith("#Start-Date: ", lines[1]);
139141
var startDate = DateTime.Parse(lines[1].Substring(13), CultureInfo.InvariantCulture);
140142
// Assert that the log was written in the last 10 seconds
141-
Assert.True(now.Subtract(startDate).TotalSeconds < 10);
143+
// W3CLogger writes start-time to second precision, so delta could be as low as -0.999...
144+
var delta = startDate.Subtract(now).TotalSeconds;
145+
Assert.InRange(delta, -1, 10);
142146

143147
Assert.Equal("#Fields: time-taken", lines[2]);
144148
double num;

‎src/Servers/IIS/IIS/test/IIS.FunctionalTests/ShadowCopyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public async Task ShadowCopyE2EWorksWithOldFoldersPresent()
199199
// Depending on timing, this could result in a shutdown failure, but sometimes it succeeds, handle both situations
200200
if (!response.IsSuccessStatusCode)
201201
{
202-
Assert.Equal("Application Shutting Down", response.ReasonPhrase);
202+
Assert.True(response.ReasonPhrase == "Application Shutting Down" || response.ReasonPhrase == "Server has been shutdown");
203203
}
204204

205205
// This shutdown should trigger a copy to the next highest directory, which will be 2

0 commit comments

Comments
 (0)