Skip to content

Commit ee8ea99

Browse files
author
Mirroring
committed
Merge commit '1de0bf15d1aeb92b5a5542ff4247ba41d154f218'
2 parents 69b589e + 1de0bf1 commit ee8ea99

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
393+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25077.4">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25111.5">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
398+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25077.4">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25111.5">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
403+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25077.4">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25111.5">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
407+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25077.4">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
411+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25077.4">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25111.5">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
415+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0-preview.1.25156.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25077.4</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25077.4</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25111.5</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25111.5</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
# in the default public locations.
3838
internalRuntimeDownloadArgs=
3939
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
40-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
40+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4141
fi
4242
4343
buildConfig=Release

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5"
3232
}
3333
}

‎src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEB
88
int wmain(int argc, wchar_t* argv[])
99
{
1010
::testing::InitGoogleTest(&argc, argv);
11-
RUN_ALL_TESTS();
11+
return RUN_ALL_TESTS();
1212
}

‎src/submodules/googletest‎

Submodule googletest updated 37 files

0 commit comments

Comments
 (0)