Skip to content

Commit 7accd07

Browse files
authored
Merge pull request #9238 from wiktork/dev/wiktork/mergeInternal
[release/10.0] Merge internal to release/10.0
2 parents 513d5eb + 165348c commit 7accd07

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-dotnet -->
13-
<add key="darc-int-dotnet-dotnet-4d3023d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-4d3023de/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-dotnet-1e7d5a8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-1e7d5a8a/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-dotnet -->
1515
<!-- Begin: Package sources from dotnet-aspnetcore -->
1616
<!-- End: Package sources from dotnet-aspnetcore -->
@@ -32,7 +32,7 @@
3232
<clear />
3333
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3434
<!-- Begin: Package sources from dotnet-dotnet -->
35-
<add key="darc-int-dotnet-dotnet-4d3023d" value="true" />
35+
<add key="darc-int-dotnet-dotnet-1e7d5a8" value="true" />
3636
<!-- End: Package sources from dotnet-dotnet -->
3737
<!-- Begin: Package sources from dotnet-aspnetcore -->
3838
<!-- End: Package sources from dotnet-aspnetcore -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.201">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.202">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
23-
<Sha>4d3023de605a78ba3e59e50c657eed70f125c68a</Sha>
23+
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26201.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -54,9 +54,9 @@
5454
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
5555
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.201-servicing.26153.122">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.202-servicing.26180.118">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
59-
<Sha>4d3023de605a78ba3e59e50c657eed70f125c68a</Sha>
59+
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
6060
</Dependency>
6161
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rtm.25523.111">
6262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
<MicrosoftFileFormatsVersion>1.0.707702</MicrosoftFileFormatsVersion>
5454
<!-- dotnet/dotnet references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100</MicrosoftCodeAnalysisNetAnalyzersVersion>
56+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.202</MicrosoftCodeAnalysisNetAnalyzersVersion>
5757
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26201.4</MicrosoftDotNetBuildTasksArchivesVersion>
5858
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.26201.4</MicrosoftDotNetCodeAnalysisVersion>
5959
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.26201.4</MicrosoftDotNetXUnitExtensionsVersion>
6060
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
6161
<SystemCommandLineVersion>2.0.0</SystemCommandLineVersion>
6262
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.201-servicing.26153.122</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
63+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.202-servicing.26180.118</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
6464
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6565
</PropertyGroup>
6666
<PropertyGroup Label="Runtime Versions">

eng/common/sdl/NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />

0 commit comments

Comments
 (0)