Skip to content

Commit eb8a9c9

Browse files
[main] Update dependencies from dotnet/arcade (#415)
* Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1
1 parent 1f7d0f6 commit eb8a9c9

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23508.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
8+
<Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
379379
}
380380

381381
# Minimum VS version to require.
382-
$vsMinVersionReqdStr = '17.6'
382+
$vsMinVersionReqdStr = '17.7'
383383
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
388-
$defaultXCopyMSBuildVersion = '17.6.0-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1
388+
$defaultXCopyMSBuildVersion = '17.7.2-1'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.7.23376.3"
3+
"version": "8.0.100-rc.1.23455.8"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-preview.7.23376.3",
6+
"dotnet": "8.0.100-rc.1.23455.8",
77
"runtimes": {
88
"dotnet": [
99
"6.0.4"
@@ -14,6 +14,6 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1"
1818
}
1919
}

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Uri RemoteAppUrl
3838
ArgumentNullException.ThrowIfNull(value);
3939

4040
// Path must end in '/' so that it will combine correctly with subpaths
41-
if (!value.AbsolutePath.EndsWith("/", StringComparison.Ordinal))
41+
if (!value.AbsolutePath.EndsWith('/'))
4242
{
4343
var builder = new UriBuilder(value);
4444
builder.Path += "/";

src/Microsoft.AspNetCore.SystemWebAdapters/HttpContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void RewritePath(string path, bool rebaseClientPath)
113113
path = path[..iqs];
114114
}
115115

116-
if (!path.StartsWith("/", StringComparison.Ordinal))
116+
if (!path.StartsWith('/'))
117117
{
118118
path = "/" + path;
119119
}

0 commit comments

Comments
 (0)