Skip to content

Commit 8b6f4da

Browse files
authored
Merge branch 'dotnet:main' into crossplatform-resource-updater
2 parents 1730f80 + 34a6601 commit 8b6f4da

File tree

329 files changed

+2243
-2203
lines changed

Some content is hidden

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

329 files changed

+2243
-2203
lines changed

eng/Version.Details.xml

Lines changed: 104 additions & 104 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,26 @@
6565
</PropertyGroup>
6666
<PropertyGroup>
6767
<!-- Dependencies from https://github.com/nuget/nuget.client -->
68-
<NuGetBuildTasksPackageVersion>6.8.0-preview.1.69</NuGetBuildTasksPackageVersion>
69-
<NuGetBuildTasksConsolePackageVersion>6.8.0-preview.1.69</NuGetBuildTasksConsolePackageVersion>
68+
<NuGetBuildTasksPackageVersion>6.8.0-preview.1.72</NuGetBuildTasksPackageVersion>
69+
<NuGetBuildTasksConsolePackageVersion>6.8.0-preview.1.72</NuGetBuildTasksConsolePackageVersion>
7070
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
71-
<NuGetBuildTasksPackPackageVersion>6.8.0-preview.1.69</NuGetBuildTasksPackPackageVersion>
72-
<NuGetCommandLineXPlatPackageVersion>6.8.0-preview.1.69</NuGetCommandLineXPlatPackageVersion>
73-
<NuGetProjectModelPackageVersion>6.8.0-preview.1.69</NuGetProjectModelPackageVersion>
74-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.8.0-preview.1.69</MicrosoftBuildNuGetSdkResolverPackageVersion>
75-
<NuGetCommonPackageVersion>6.8.0-preview.1.69</NuGetCommonPackageVersion>
76-
<NuGetConfigurationPackageVersion>6.8.0-preview.1.69</NuGetConfigurationPackageVersion>
77-
<NuGetFrameworksPackageVersion>6.8.0-preview.1.69</NuGetFrameworksPackageVersion>
78-
<NuGetPackagingPackageVersion>6.8.0-preview.1.69</NuGetPackagingPackageVersion>
79-
<NuGetVersioningPackageVersion>6.8.0-preview.1.69</NuGetVersioningPackageVersion>
71+
<NuGetBuildTasksPackPackageVersion>6.8.0-preview.1.72</NuGetBuildTasksPackPackageVersion>
72+
<NuGetCommandLineXPlatPackageVersion>6.8.0-preview.1.72</NuGetCommandLineXPlatPackageVersion>
73+
<NuGetProjectModelPackageVersion>6.8.0-preview.1.72</NuGetProjectModelPackageVersion>
74+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.8.0-preview.1.72</MicrosoftBuildNuGetSdkResolverPackageVersion>
75+
<NuGetCommonPackageVersion>6.8.0-preview.1.72</NuGetCommonPackageVersion>
76+
<NuGetConfigurationPackageVersion>6.8.0-preview.1.72</NuGetConfigurationPackageVersion>
77+
<NuGetFrameworksPackageVersion>6.8.0-preview.1.72</NuGetFrameworksPackageVersion>
78+
<NuGetPackagingPackageVersion>6.8.0-preview.1.72</NuGetPackagingPackageVersion>
79+
<NuGetVersioningPackageVersion>6.8.0-preview.1.72</NuGetVersioningPackageVersion>
8080
<NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
8181
<NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
8282
</PropertyGroup>
8383
<PropertyGroup>
8484
<!-- Dependencies from https://github.com/Microsoft/vstest -->
85-
<MicrosoftNETTestSdkPackageVersion>17.8.0-preview-23417-01</MicrosoftNETTestSdkPackageVersion>
86-
<MicrosoftTestPlatformCLIPackageVersion>17.8.0-preview-23417-01</MicrosoftTestPlatformCLIPackageVersion>
87-
<MicrosoftTestPlatformBuildPackageVersion>17.8.0-preview-23417-01</MicrosoftTestPlatformBuildPackageVersion>
85+
<MicrosoftNETTestSdkPackageVersion>17.8.0-preview-23421-06</MicrosoftNETTestSdkPackageVersion>
86+
<MicrosoftTestPlatformCLIPackageVersion>17.8.0-preview-23421-06</MicrosoftTestPlatformCLIPackageVersion>
87+
<MicrosoftTestPlatformBuildPackageVersion>17.8.0-preview-23421-06</MicrosoftTestPlatformBuildPackageVersion>
8888
</PropertyGroup>
8989
<PropertyGroup>
9090
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -98,27 +98,27 @@
9898
</PropertyGroup>
9999
<PropertyGroup>
100100
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
101-
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23416.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
102-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.23416.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
101+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.23422.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
102+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.23422.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
103103
</PropertyGroup>
104104
<PropertyGroup>
105105
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
106-
<MicrosoftBuildPackageVersion>17.8.0-preview-23418-03</MicrosoftBuildPackageVersion>
106+
<MicrosoftBuildPackageVersion>17.8.0-preview-23422-03</MicrosoftBuildPackageVersion>
107107
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
108108
so target one that matches the version in minimumMSBuildVersion.
109109
110110
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
111111
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
112112
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
113113
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
114-
<MicrosoftBuildLocalizationPackageVersion>17.8.0-preview-23418-03</MicrosoftBuildLocalizationPackageVersion>
114+
<MicrosoftBuildLocalizationPackageVersion>17.8.0-preview-23422-03</MicrosoftBuildLocalizationPackageVersion>
115115
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
116116
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
117117
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
118118
</PropertyGroup>
119119
<PropertyGroup>
120120
<!-- Dependencies from https://github.com/dotnet/templating -->
121-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-alpha.1.23418.7</MicrosoftTemplateEngineAbstractionsPackageVersion>
121+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-alpha.1.23422.4</MicrosoftTemplateEngineAbstractionsPackageVersion>
122122
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
123123
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
124124
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
@@ -131,7 +131,7 @@
131131
</PropertyGroup>
132132
<PropertyGroup>
133133
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
134-
<MicrosoftFSharpCompilerPackageVersion>12.8.0-beta.23418.2</MicrosoftFSharpCompilerPackageVersion>
134+
<MicrosoftFSharpCompilerPackageVersion>12.8.0-beta.23421.4</MicrosoftFSharpCompilerPackageVersion>
135135
</PropertyGroup>
136136
<PropertyGroup>
137137
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -146,23 +146,23 @@
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
149-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreAppRefPackageVersion>
150-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
151-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
152-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
153-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
154-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreAnalyzersPackageVersion>
155-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-alpha.1.23421.18</MicrosoftAspNetCoreTestHostPackageVersion>
149+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreAppRefPackageVersion>
150+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
151+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
152+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
153+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
154+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreAnalyzersPackageVersion>
155+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-alpha.1.23422.14</MicrosoftAspNetCoreTestHostPackageVersion>
156156
</PropertyGroup>
157157
<!-- Dependencies from https://github.com/dotnet/razor -->
158158
<PropertyGroup>
159-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.23421.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
160-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.23421.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
161-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.23421.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
159+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.23422.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
160+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.23422.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
161+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.23422.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
162162
</PropertyGroup>
163163
<PropertyGroup>
164164
<!-- Dependencies from https://github.com/dotnet/wpf -->
165-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-alpha.1.23421.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
165+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-alpha.1.23421.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
166166
</PropertyGroup>
167167
<PropertyGroup Label="Manually updated">
168168
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.cs.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.de.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.fr.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.ja.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.ko.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.pl.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.pt-BR.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiCompat/Microsoft.DotNet.ApiCompat.Shared/xlf/CommonResources.ru.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)