Skip to content

Commit 00611ec

Browse files
xtqqczzextqqczze
authored
Merge branch 'main' into SC2068
2 parents eadd4ee + 5c32309 commit 00611ec

File tree

51 files changed

+2162
-743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2162
-743
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.25475.2",
6+
"version": "1.1.0-beta.25501.1",
77
"commands": [
88
"secret-manager"
99
]

‎Arcade.slnx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<Project Path="src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj" />
3030
<Project Path="src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj" />
3131
<Project Path="src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj" />
32+
<Project Path="src/Microsoft.DotNet.SetupNugetSources.Tests/Microsoft.DotNet.SetupNugetSources.Tests.csproj" />
3233
<Project Path="src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj" />
3334
<Project Path="src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj" />
3435
<Project Path="src/Microsoft.DotNet.XliffTasks.Tests/Microsoft.DotNet.XliffTasks.Tests.csproj" />
@@ -45,6 +46,7 @@
4546
<Project Path="src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj" />
4647
<Project Path="src/Microsoft.DotNet.ArcadeAzureIntegration/Microsoft.DotNet.ArcadeAzureIntegration.csproj" />
4748
<Project Path="src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj" />
49+
<Project Path="src/Microsoft.DotNet.Baselines.Tasks/Microsoft.DotNet.Baselines.Tasks.csproj" />
4850
<Project Path="src/Microsoft.DotNet.Build.Manifest/Microsoft.DotNet.Build.Manifest.csproj" />
4951
<Project Path="src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj" />
5052
<Project Path="src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj" />
@@ -71,7 +73,6 @@
7173
<Project Path="src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj" />
7274
<Project Path="src/Microsoft.DotNet.StrongName/Microsoft.DotNet.StrongName.csproj" />
7375
<Project Path="src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj" />
74-
<Project Path="src/Microsoft.DotNet.Baselines.Tasks/Microsoft.DotNet.Baselines.Tasks.csproj" />
7576
<Project Path="src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj" />
7677
<Project Path="src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj" />
7778
<Project Path="src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj" />

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Overwrite XUnitVersion/XUnitAnalyzersVersion/XUnitRunnerConsoleVersion/XUnitRunnerVisualStudioVersion that comes from the Arcade SDK to be in sync as Arcade doesn't use a live Arcade SDK.
1616
Keep in sync with DefaultVersions.props. -->
1717
<XUnitVersion>2.9.3</XUnitVersion>
18-
<XUnitV3Version>3.0.0</XUnitV3Version>
18+
<XUnitV3Version>3.1.0</XUnitV3Version>
1919
<XUnitAnalyzersVersion>1.22.0</XUnitAnalyzersVersion>
2020
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
2121
<XUnitRunnerVisualStudioVersion>3.1.3</XUnitRunnerVisualStudioVersion>
@@ -77,11 +77,11 @@
7777

7878
<!-- external -->
7979
<ItemGroup>
80-
<PackageVersion Include="Azure.Core" Version="1.47.0" />
81-
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
80+
<PackageVersion Include="Azure.Core" Version="1.49.0" />
81+
<PackageVersion Include="Azure.Identity" Version="1.15.0" />
8282
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
8383
<PackageVersion Include="CommandLineParser" Version="2.5.0" />
84-
<PackageVersion Include="coverlet.collector" Version="1.0.1" />
84+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
8585
<PackageVersion Include="FluentAssertions" Version="5.10.3" />
8686
<PackageVersion Include="Handlebars.Net" Version="1.11.5" />
8787
<PackageVersion Include="JetBrains.Annotations" Version="2018.2.1" />

‎NuGet.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,4 @@
5454
<disabledPackageSources>
5555
<clear />
5656
</disabledPackageSources>
57-
<auditSources>
58-
<clear />
59-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
60-
</auditSources>
6157
</configuration>

‎eng/BuildTask.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<!-- Don't go higher than binding redirects entries in the toolset MSBuild.exe.config file. -->
44
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
5-
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
6-
<PackageVersion Update="System.Collections.Immutable" Version="8.0.0" />
7-
<PackageVersion Update="System.Reflection.Metadata" Version="8.0.0" />
8-
<PackageVersion Update="System.Reflection.MetadataLoadContext" Version="8.0.0" />
9-
<PackageVersion Update="System.Resources.Extensions" Version="8.0.0" />
10-
<PackageVersion Update="System.Text.Encodings.Web" Version="8.0.0" />
11-
<PackageVersion Update="System.Text.Json" Version="8.0.5" />
12-
<PackageVersion Update="System.Threading.Tasks.Dataflow" Version="8.0.0" />
5+
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
6+
<PackageVersion Update="System.Collections.Immutable" Version="9.0.0" />
7+
<PackageVersion Update="System.Reflection.Metadata" Version="9.0.0" />
8+
<PackageVersion Update="System.Reflection.MetadataLoadContext" Version="9.0.0" />
9+
<PackageVersion Update="System.Resources.Extensions" Version="9.0.0" />
10+
<PackageVersion Update="System.Text.Encodings.Web" Version="9.0.0" />
11+
<PackageVersion Update="System.Text.Json" Version="9.0.0" />
12+
<PackageVersion Update="System.Threading.Tasks.Dataflow" Version="9.0.0" />
1313

1414
<!-- Packages that transitively bring above dependencies in. -->
1515
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />

‎eng/Version.Details.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@ This file should be imported by eng/Versions.props
1616
<!-- dotnet/templating dependencies -->
1717
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.4.25220.1</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1818
<!-- dotnet/arcade dependencies -->
19-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25477.2</MicrosoftDotNetArcadeSdkPackageVersion>
20-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25477.2</MicrosoftDotNetHelixSdkPackageVersion>
19+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25509.1</MicrosoftDotNetArcadeSdkPackageVersion>
20+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25509.1</MicrosoftDotNetHelixSdkPackageVersion>
2121
<!-- dotnet/arcade-services dependencies -->
22-
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25475.1</MicrosoftDotNetDarcLibPackageVersion>
23-
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25475.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
22+
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25510.2</MicrosoftDotNetDarcLibPackageVersion>
23+
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25510.2</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
2424
<!-- dotnet/xharness dependencies -->
2525
<MicrosoftDotNetXHarnessCLIPackageVersion>10.0.0-prerelease.25475.1</MicrosoftDotNetXHarnessCLIPackageVersion>
2626
<!-- dotnet/symreader-converter dependencies -->
2727
<MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
2828
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>
2929
<!-- dotnet/diagnostics dependencies -->
3030
<MicrosoftSymbolManifestGeneratorPackageVersion>8.0.0-preview.24461.2</MicrosoftSymbolManifestGeneratorPackageVersion>
31-
<!-- _git/dotnet-runtime dependencies -->
32-
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-rc.2.24473.5</MicrosoftBclAsyncInterfacesPackageVersion>
33-
<MicrosoftExtensionsDependencyInjectionPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDependencyInjectionPackageVersion>
34-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
35-
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDependencyModelPackageVersion>
36-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
37-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
38-
<MicrosoftExtensionsHttpPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsHttpPackageVersion>
39-
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsLoggingConsolePackageVersion>
40-
<SystemCollectionsImmutablePackageVersion>9.0.0-rc.2.24473.5</SystemCollectionsImmutablePackageVersion>
41-
<SystemFormatsAsn1PackageVersion>9.0.0-rc.2.24473.5</SystemFormatsAsn1PackageVersion>
42-
<SystemIOPackagingPackageVersion>9.0.0-rc.2.24473.5</SystemIOPackagingPackageVersion>
43-
<SystemReflectionMetadataPackageVersion>9.0.0-rc.2.24473.5</SystemReflectionMetadataPackageVersion>
44-
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-rc.2.24473.5</SystemSecurityCryptographyPkcsPackageVersion>
45-
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-rc.2.24473.5</SystemSecurityCryptographyXmlPackageVersion>
46-
<SystemTextEncodingsWebPackageVersion>9.0.0-rc.2.24473.5</SystemTextEncodingsWebPackageVersion>
47-
<SystemTextJsonPackageVersion>9.0.0-rc.2.24473.5</SystemTextJsonPackageVersion>
31+
<!-- dotnet/runtime dependencies -->
32+
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
33+
<MicrosoftExtensionsDependencyInjectionPackageVersion>9.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
34+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
35+
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
36+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
37+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
38+
<MicrosoftExtensionsHttpPackageVersion>9.0.0</MicrosoftExtensionsHttpPackageVersion>
39+
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
40+
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
41+
<SystemFormatsAsn1PackageVersion>9.0.0</SystemFormatsAsn1PackageVersion>
42+
<SystemIOPackagingPackageVersion>9.0.0</SystemIOPackagingPackageVersion>
43+
<SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
44+
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0</SystemSecurityCryptographyPkcsPackageVersion>
45+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0</SystemSecurityCryptographyXmlPackageVersion>
46+
<SystemTextEncodingsWebPackageVersion>9.0.0</SystemTextEncodingsWebPackageVersion>
47+
<SystemTextJsonPackageVersion>9.0.0</SystemTextJsonPackageVersion>
4848
<!-- JamesNK/Newtonsoft.Json dependencies -->
4949
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
5050
<!-- dotnet/deployment-tools dependencies -->
@@ -54,7 +54,7 @@ This file should be imported by eng/Versions.props
5454
<!-- dotnet/command-line-api dependencies -->
5555
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
5656
<!-- dotnet/dnceng dependencies -->
57-
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25475.2</MicrosoftDncEngSecretManagerPackageVersion>
57+
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25501.1</MicrosoftDncEngSecretManagerPackageVersion>
5858
<!-- dotnet/msbuild dependencies -->
5959
<MicrosoftBuildPackageVersion>17.12.36</MicrosoftBuildPackageVersion>
6060
<MicrosoftBuildFrameworkPackageVersion>17.12.36</MicrosoftBuildFrameworkPackageVersion>
@@ -86,7 +86,7 @@ This file should be imported by eng/Versions.props
8686
<MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbPackageVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
8787
<!-- dotnet/diagnostics dependencies -->
8888
<MicrosoftSymbolManifestGeneratorVersion>$(MicrosoftSymbolManifestGeneratorPackageVersion)</MicrosoftSymbolManifestGeneratorVersion>
89-
<!-- _git/dotnet-runtime dependencies -->
89+
<!-- dotnet/runtime dependencies -->
9090
<MicrosoftBclAsyncInterfacesVersion>$(MicrosoftBclAsyncInterfacesPackageVersion)</MicrosoftBclAsyncInterfacesVersion>
9191
<MicrosoftExtensionsDependencyInjectionVersion>$(MicrosoftExtensionsDependencyInjectionPackageVersion)</MicrosoftExtensionsDependencyInjectionVersion>
9292
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>

0 commit comments

Comments
 (0)