[main] Update dependencies from dotnet/arcade (#496)

dotnet-maestro[bot] · web-flow · commit aac9078922c7 · 2024-03-28T20:58:45.000Z
[main] Update dependencies from dotnet/arcade


 - Add nullable annotations
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23628.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24172.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
+      <Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
@@ -128,7 +128,7 @@ jobs:
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@3
+      - task: MicroBuildSigningPlugin@4
         displayName: Install MicroBuild plugin
         inputs:
           signType: $(_SignType)
diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml
@@ -98,14 +98,16 @@ jobs:
       inputs:
         targetType: inline
         script: |
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
+          New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
+          $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
+          Add-Content -Path $filePath -Value $(BARBuildId)
+          Add-Content -Path $filePath -Value "$(DefaultChannels)"
+          Add-Content -Path $filePath -Value $(IsStableBuild)
     
     - task: 1ES.PublishBuildArtifacts@1
       displayName: Publish ReleaseConfigs Artifact
       inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
+        PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
         PublishLocation: Container
         ArtifactName: ReleaseConfigs
 
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.100-alpha.1.23615.4"
+    "version": "9.0.100-preview.1.24101.2"
   },
   "tools": {
-    "dotnet": "9.0.100-alpha.1.23615.4",
+    "dotnet": "9.0.100-preview.1.24101.2",
     "runtimes": {
       "dotnet": [
         "6.0.4",
@@ -18,6 +18,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4"
   }
 }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs
@@ -24,16 +24,16 @@ public class RemoteAppClientOptionsTests
     [InlineData("HeaderName", "", "http://test", false)]
     [InlineData("HeaderName", "36705d36-eba0-44f9-a2e0-c57e6f521274", null, false)]
     [Theory]
-    public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteApp, bool shouldSucceed)
+    public void VerifyIsCalled(string? apiKeyHeader, string? apiKey, string? remoteApp, bool shouldSucceed)
     {
         // Arrange
         var services = new ServiceCollection();
         var builder = new TestBuilder { Services = services };
 
         builder.AddRemoteAppClient(options =>
         {
-            options.ApiKey = apiKey;
-            options.ApiKeyHeader = apiKeyHeader;
+            options.ApiKey = apiKey!;
+            options.ApiKeyHeader = apiKeyHeader!;
 
             if (remoteApp is not null)
             {
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationModuleTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationModuleTests.cs
@@ -28,7 +28,7 @@ public class RemoteAppAuthenticationModuleTests
     [InlineData(null, null, "", 400, null, null)]
     [InlineData(null, null, "http://a", 400, null, null)]
     [Theory]
-    public void VerifyAuthenticationRequestHandling(string apiKey, string authMigrationHeader, string originalPath, int expectedStatusCode, string expectedRedirect, Type expectedHandlerType)
+    public void VerifyAuthenticationRequestHandling(string? apiKey, string? authMigrationHeader, string? originalPath, int expectedStatusCode, string? expectedRedirect, Type? expectedHandlerType)
     {
         // Arrange
 
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs
@@ -15,15 +15,15 @@ public class RemoteAppAuthenticationServerOptionsTests
     [InlineData(null, false)]
     [InlineData("", false)]
     [Theory]
-    public void VerifyIsCalled(string endpoint, bool shouldSucceed)
+    public void VerifyIsCalled(string? endpoint, bool shouldSucceed)
     {
         // Arrange
         var services = new ServiceCollection();
         var builder = new TestBuilder { Services = services };
 
         builder.AddAuthenticationServer(options =>
         {
-            options.AuthenticationEndpointPath = endpoint;
+            options.AuthenticationEndpointPath = endpoint!;
         });
 
         using var serviceProvider = services.BuildServiceProvider();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs
@@ -21,16 +21,16 @@ public class RemoteAppServerOptionsTests
     [InlineData("HeaderName", null, false)]
     [InlineData("HeaderName", "", false)]
     [Theory]
-    public void VerifyIsCalled(string apiKeyHeader, string apiKey, bool shouldSucceed)
+    public void VerifyIsCalled(string? apiKeyHeader, string? apiKey, bool shouldSucceed)
     {
         // Arrange
         var services = new ServiceCollection();
         var builder = new TestBuilder { Services = services };
 
         builder.AddRemoteAppServer(options =>
         {
-            options.ApiKey = apiKey;
-            options.ApiKeyHeader = apiKeyHeader;
+            options.ApiKey = apiKey!;
+            options.ApiKeyHeader = apiKeyHeader!;
         });
 
         using var serviceProvider = services.BuildServiceProvider();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteSession/RemoteSessionModuleTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteSession/RemoteSessionModuleTests.cs
@@ -37,7 +37,7 @@ public RemoteSessionModuleTests()
     [InlineData("PUT", "false", 0, ApiKey1, ApiKey1, typeof(StoreSessionStateHandler))]
     [InlineData("POST", null, 405, ApiKey1, ApiKey1, null)]
     [Theory]
-    public void VerifyCorrectHandler(string method, string readOnlyHeaderValue, int statusCode, string expectedApiKey, string apiKey, Type handlerType)
+    public void VerifyCorrectHandler(string method, string? readOnlyHeaderValue, int statusCode, string expectedApiKey, string apiKey, Type? handlerType)
     {
         // Arrange
         var sessionOptions = Options.Create(new RemoteAppSessionStateServerOptions());
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteSession/StoreSessionStateHandlerTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteSession/StoreSessionStateHandlerTests.cs
@@ -66,7 +66,7 @@ public async Task NoCookieSet()
     [InlineData((int)SessionSaveResult.AlreadyUpdated, 400, StoreSessionStateHandler.Messages.SessionAlreadyUpdated)]
     [InlineData((int)SessionSaveResult.DeserializationError, 400, StoreSessionStateHandler.Messages.DeserializationFailed)]
     [Theory]
-    public async Task WithCookie(int result, int statusCode, string description)
+    public async Task WithCookie(int result, int statusCode, string? description)
     {
         // Arrange
         var output = new Mock<Stream>();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs
@@ -411,7 +411,7 @@ public void ErrorWithFeatureAdd()
         [InlineData("/path1?q=1", "/path1", "?q=1")]
         [InlineData("/path1 ?q=1", "/path1", "?q=1")]
         [Theory]
-        public void RewritePath(string rewritePath, string finalPath, string finalQuery)
+        public void RewritePath(string rewritePath, string finalPath, string? finalQuery)
         {
             // Arrange
             var coreContext = new DefaultHttpContext();
@@ -441,7 +441,7 @@ public void RewritePath(string rewritePath, string finalPath, string finalQuery)
         [InlineData("/path1 ?q=1", "/path1", "?q=1", true)]
         [InlineData("/path1 ?q=1", "/path1", "?q=1", false)]
         [Theory]
-        public void RewritePathWithRebaseValue(string rewritePath, string finalPath, string finalQuery, bool rebase)
+        public void RewritePathWithRebaseValue(string rewritePath, string finalPath, string? finalQuery, bool rebase)
         {
             // Arrange
             var coreContext = new DefaultHttpContext();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpCookieCollectionTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpCookieCollectionTests.cs
@@ -30,7 +30,7 @@ public HttpCookieCollectionTests()
     [InlineData(false, false, true, null)]
     [InlineData(false, false, false, null)]
     [Theory]
-    public async Task ShareableCookieSetsCacheControlAsync(bool isPublic, bool isShareable, bool isHttps, string expectedCacheControl)
+    public async Task ShareableCookieSetsCacheControlAsync(bool isPublic, bool isShareable, bool isHttps, string? expectedCacheControl)
     {
         // Arrange
         var cookieName = _fixture.Create<string>();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs
@@ -632,7 +632,7 @@ public enum ContentEncodingType
         [InlineData(null, ContentEncodingType.None)]
         [InlineData("application/json;charset=utf-8", ContentEncodingType.UTF8)]
         [InlineData("application/json;charset=utf-32", ContentEncodingType.UTF32)]
-        public void ContentEncoding(string contentType, ContentEncodingType type)
+        public void ContentEncoding(string? contentType, ContentEncodingType type)
         {
             // Arrange
             var headers = new HeaderDictionary
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs
@@ -72,7 +72,7 @@ public void CombineError()
         [InlineData("/test", "/test/")]
         [InlineData("test", "test/")]
         [Theory]
-        public void AppendTrailingSlash(string virtualPath, string expected)
+        public void AppendTrailingSlash(string? virtualPath, string? expected)
         {
             Assert.Equal(expected, VirtualPathUtilityImpl.AppendTrailingSlash(virtualPath));
         }
@@ -82,9 +82,9 @@ public void AppendTrailingSlash(string virtualPath, string expected)
         [InlineData("/", "/")]
         [InlineData("/test/", "/test")]
         [Theory]
-        public void RemoveTrailingSlash(string virtualPath, string expected)
+        public void RemoveTrailingSlash(string? virtualPath, string? expected)
         {
-            Assert.Equal(expected, VirtualPathUtilityImpl.RemoveTrailingSlash(virtualPath));
+            Assert.Equal(expected, VirtualPathUtilityImpl.RemoveTrailingSlash(virtualPath!));
         }
 
         // These are conditional so that these tests can be run against net48.
@@ -99,7 +99,7 @@ public void RemoveTrailingSlash(string virtualPath, string expected)
         [InlineData("/test", "/")]
         [InlineData("/test/world.jpg", "/test/")]
         [Theory]
-        public void GetDirectory(string virtualPath, string expected)
+        public void GetDirectory(string virtualPath, string? expected)
         {
             Assert.Equal(expected, VirtualPathUtilityImpl.GetDirectory(virtualPath));
         }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.100-alpha.1.23615.4"`
	`3`	`+ "version": "9.0.100-preview.1.24101.2"`
`4`	`4`	`},`
`5`	`5`	`"tools": {`
`6`		`- "dotnet": "9.0.100-alpha.1.23615.4",`
	`6`	`+ "dotnet": "9.0.100-preview.1.24101.2",`
`7`	`7`	`"runtimes": {`
`8`	`8`	`"dotnet": [`
`9`	`9`	`"6.0.4",`
`@@ -18,6 +18,6 @@`
`18`	`18`	`}`
`19`	`19`	`},`
`20`	`20`	`"msbuild-sdks": {`
`21`		`- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1"`
	`21`	`+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,16 @@ public class RemoteAppClientOptionsTests`
`24`	`24`	`[InlineData("HeaderName", "", "http://test", false)]`
`25`	`25`	`[InlineData("HeaderName", "36705d36-eba0-44f9-a2e0-c57e6f521274", null, false)]`
`26`	`26`	`[Theory]`
`27`		`- public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteApp, bool shouldSucceed)`
	`27`	`+ public void VerifyIsCalled(string? apiKeyHeader, string? apiKey, string? remoteApp, bool shouldSucceed)`
`28`	`28`	`{`
`29`	`29`	`// Arrange`
`30`	`30`	`var services = new ServiceCollection();`
`31`	`31`	`var builder = new TestBuilder { Services = services };`
`32`	`32`
`33`	`33`	`builder.AddRemoteAppClient(options =>`
`34`	`34`	`{`
`35`		`- options.ApiKey = apiKey;`
`36`		`- options.ApiKeyHeader = apiKeyHeader;`
	`35`	`+ options.ApiKey = apiKey!;`
	`36`	`+ options.ApiKeyHeader = apiKeyHeader!;`
`37`	`37`
`38`	`38`	`if (remoteApp is not null)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class RemoteAppAuthenticationModuleTests`
`28`	`28`	`[InlineData(null, null, "", 400, null, null)]`
`29`	`29`	`[InlineData(null, null, "http://a", 400, null, null)]`
`30`	`30`	`[Theory]`
`31`		`- public void VerifyAuthenticationRequestHandling(string apiKey, string authMigrationHeader, string originalPath, int expectedStatusCode, string expectedRedirect, Type expectedHandlerType)`
	`31`	`+ public void VerifyAuthenticationRequestHandling(string? apiKey, string? authMigrationHeader, string? originalPath, int expectedStatusCode, string? expectedRedirect, Type? expectedHandlerType)`
`32`	`32`	`{`
`33`	`33`	`// Arrange`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public RemoteSessionModuleTests()`
`37`	`37`	`[InlineData("PUT", "false", 0, ApiKey1, ApiKey1, typeof(StoreSessionStateHandler))]`
`38`	`38`	`[InlineData("POST", null, 405, ApiKey1, ApiKey1, null)]`
`39`	`39`	`[Theory]`
`40`		`- public void VerifyCorrectHandler(string method, string readOnlyHeaderValue, int statusCode, string expectedApiKey, string apiKey, Type handlerType)`
	`40`	`+ public void VerifyCorrectHandler(string method, string? readOnlyHeaderValue, int statusCode, string expectedApiKey, string apiKey, Type? handlerType)`
`41`	`41`	`{`
`42`	`42`	`// Arrange`
`43`	`43`	`var sessionOptions = Options.Create(new RemoteAppSessionStateServerOptions());`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public async Task NoCookieSet()`
`66`	`66`	`[InlineData((int)SessionSaveResult.AlreadyUpdated, 400, StoreSessionStateHandler.Messages.SessionAlreadyUpdated)]`
`67`	`67`	`[InlineData((int)SessionSaveResult.DeserializationError, 400, StoreSessionStateHandler.Messages.DeserializationFailed)]`
`68`	`68`	`[Theory]`
`69`		`- public async Task WithCookie(int result, int statusCode, string description)`
	`69`	`+ public async Task WithCookie(int result, int statusCode, string? description)`
`70`	`70`	`{`
`71`	`71`	`// Arrange`
`72`	`72`	`var output = new Mock<Stream>();`