Skip to content

Commit 110adb8

Browse files
jkoritzinskyjkoritzinsky
committed
Merge branch 'main' of https://github.com/dotnet/aspnetcore into sfx-aspnetcore
2 parents e712bc7 + 46ea84f commit 110adb8

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -384,39 +384,39 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>1b27ee9197251edcc9167a48b87786d3a6b5c163</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24531.1">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24531.2">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
389+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24531.1">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24531.2">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
394+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24531.1">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24531.2">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
399+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24531.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24531.2">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
403+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24531.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24531.2">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
407+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24531.1">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24531.2">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
411+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24531.1">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24531.2">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>d1bc0779143e410ec82696f9865c4eb407db8d67</Sha>
415+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24531.1">
417+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24531.2">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
419+
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
420420
</Dependency>
421421
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24525.2">
422422
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24531.1</MicrosoftDotNetBuildTasksArchivesVersion>
169-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24531.1</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24531.1</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24531.1</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24531.1</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24531.2</MicrosoftDotNetBuildTasksArchivesVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24531.2</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24531.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24531.2</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24531.2</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24516.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24531.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24531.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk" : "10.0.0-beta.24531.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24531.2",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24531.2",
32+
"Microsoft.DotNet.SharedFramework.Sdk" : "10.0.0-beta.24531.2",
3333
"Microsoft.Build.Traversal": "3.4.0"
3434
}
3535
}

‎src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export module DotNet {
7272
// However since we're the one calling the import keyword, they would be resolved relative to
7373
// this framework bundle URL. Fix this by providing an absolute URL.
7474
if (typeof url === "string" && url.startsWith("./")) {
75-
url = new URL(url.substr(2), document.baseURI).toString();
75+
url = new URL(url.substring(2), document.baseURI).toString();
7676
}
7777

7878
return import(/* webpackIgnore: true */ url);

‎src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ describe("hubConnection", () => {
302302
// client side method names are case insensitive
303303
let methodName = "message";
304304
const idx = Math.floor(Math.random() * (methodName.length - 1));
305-
methodName = methodName.substr(0, idx) + methodName[idx].toUpperCase() + methodName.substr(idx + 1);
305+
methodName = methodName.substring(0, idx) + methodName[idx].toUpperCase() + methodName.substring(idx + 1);
306306

307307
const receivePromise = new PromiseSource<string>();
308308
hubConnection.on(methodName, (msg) => {
@@ -328,7 +328,7 @@ describe("hubConnection", () => {
328328
// client side method names are case insensitive
329329
let methodName = "message";
330330
const idx = Math.floor(Math.random() * (methodName.length - 1));
331-
methodName = methodName.substr(0, idx) + methodName[idx].toUpperCase() + methodName.substr(idx + 1);
331+
methodName = methodName.substring(0, idx) + methodName[idx].toUpperCase() + methodName.substring(idx + 1);
332332

333333
let closeCount = 0;
334334
let invocationCount = 0;

‎src/SignalR/clients/ts/signalr/src/Utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export function formatArrayBuffer(data: ArrayBuffer): string {
8787
});
8888

8989
// Trim of trailing space.
90-
return str.substr(0, str.length - 1);
90+
return str.substring(0, str.length - 1);
9191
}
9292

9393
// Also in signalr-protocol-msgpack/Utils.ts

0 commit comments

Comments
 (0)