Skip to content

Commit 3547383

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into merge/release/9.0.2xx-to-main
2 parents 4037180 + 60e80a6 commit 3547383

15 files changed

+460
-465
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
7070
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
7171
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
72-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.23" />
72+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.26" />
7373
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7474
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7575
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
2929
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3030
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
31-
<MicrosoftTestingPlatformVersion>1.5.0-preview.24602.2</MicrosoftTestingPlatformVersion>
31+
<MicrosoftTestingPlatformVersion>1.5.0-preview.24604.3</MicrosoftTestingPlatformVersion>
3232
</PropertyGroup>
3333
<PropertyGroup Label="Servicing version information">
3434
<VersionFeature21>30</VersionFeature21>
@@ -95,7 +95,7 @@
9595
</PropertyGroup>
9696
<PropertyGroup>
9797
<!-- Dependency from https://github.com/dotnet/winforms -->
98-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24573.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
98+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24578.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
9999
</PropertyGroup>
100100
<PropertyGroup>
101101
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -153,24 +153,24 @@
153153
</PropertyGroup>
154154
<PropertyGroup>
155155
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
156-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24576.3</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
157-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24576.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
158-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24576.3</MicrosoftWindowsDesktopAppRefPackageVersion>
156+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24602.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
157+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24602.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
158+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24602.1</MicrosoftWindowsDesktopAppRefPackageVersion>
159159
</PropertyGroup>
160160
<PropertyGroup>
161161
<!-- Dependencies from https://github.com/nuget/nuget.client -->
162-
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackageVersion>
163-
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.73</NuGetBuildTasksConsolePackageVersion>
164-
<NuGetLocalizationPackageVersion>6.13.0-preview.1.73</NuGetLocalizationPackageVersion>
165-
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackPackageVersion>
166-
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.73</NuGetCommandLineXPlatPackageVersion>
167-
<NuGetProjectModelPackageVersion>6.13.0-preview.1.73</NuGetProjectModelPackageVersion>
168-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.73</MicrosoftBuildNuGetSdkResolverPackageVersion>
169-
<NuGetCommonPackageVersion>6.13.0-preview.1.73</NuGetCommonPackageVersion>
170-
<NuGetConfigurationPackageVersion>6.13.0-preview.1.73</NuGetConfigurationPackageVersion>
171-
<NuGetFrameworksPackageVersion>6.13.0-preview.1.73</NuGetFrameworksPackageVersion>
172-
<NuGetPackagingPackageVersion>6.13.0-preview.1.73</NuGetPackagingPackageVersion>
173-
<NuGetVersioningPackageVersion>6.13.0-preview.1.73</NuGetVersioningPackageVersion>
162+
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.84</NuGetBuildTasksPackageVersion>
163+
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.84</NuGetBuildTasksConsolePackageVersion>
164+
<NuGetLocalizationPackageVersion>6.13.0-preview.1.84</NuGetLocalizationPackageVersion>
165+
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.84</NuGetBuildTasksPackPackageVersion>
166+
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.84</NuGetCommandLineXPlatPackageVersion>
167+
<NuGetProjectModelPackageVersion>6.13.0-preview.1.84</NuGetProjectModelPackageVersion>
168+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.84</MicrosoftBuildNuGetSdkResolverPackageVersion>
169+
<NuGetCommonPackageVersion>6.13.0-preview.1.84</NuGetCommonPackageVersion>
170+
<NuGetConfigurationPackageVersion>6.13.0-preview.1.84</NuGetConfigurationPackageVersion>
171+
<NuGetFrameworksPackageVersion>6.13.0-preview.1.84</NuGetFrameworksPackageVersion>
172+
<NuGetPackagingPackageVersion>6.13.0-preview.1.84</NuGetPackagingPackageVersion>
173+
<NuGetVersioningPackageVersion>6.13.0-preview.1.84</NuGetVersioningPackageVersion>
174174
</PropertyGroup>
175175
<PropertyGroup>
176176
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -180,8 +180,8 @@
180180
</PropertyGroup>
181181
<PropertyGroup>
182182
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
183-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24574.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
184-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24574.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
183+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24602.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
184+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24602.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -200,8 +200,8 @@
200200
then use that in Directory.Packages.props.
201201
202202
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
203-
<MicrosoftBuildVersion>17.13.0-preview-24568-05</MicrosoftBuildVersion>
204-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24568-05</MicrosoftBuildLocalizationVersion>
203+
<MicrosoftBuildVersion>17.13.0-preview-24604-04</MicrosoftBuildVersion>
204+
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24604-04</MicrosoftBuildLocalizationVersion>
205205
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
206206
<MinimumVSVersion>17.12</MinimumVSVersion>
207207
</PropertyGroup>
@@ -235,30 +235,30 @@
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
238-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRefPackageVersion>
239-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
244-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreTestHostPackageVersion>
245-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24602.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24602.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24602.1</dotnetdevcertsPackageVersion>
249-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24602.1</dotnetuserjwtsPackageVersion>
250-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24602.1</dotnetusersecretsPackageVersion>
238+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRefPackageVersion>
239+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
244+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreTestHostPackageVersion>
245+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24602.4</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24602.4</dotnetdevcertsPackageVersion>
249+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24602.4</dotnetuserjwtsPackageVersion>
250+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24602.4</dotnetusersecretsPackageVersion>
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/razor -->
254-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24601.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
255-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24601.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24601.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
254+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24602.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
255+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24602.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24602.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/wpf -->
260-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24576.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
261-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24576.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
260+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24602.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
261+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24602.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
262262
</PropertyGroup>
263263
<PropertyGroup Label="Template versions">
264264
<!-- 10.0 Template versions -->
@@ -285,12 +285,12 @@
285285
</PropertyGroup>
286286
<PropertyGroup>
287287
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
288-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24577.2</MicrosoftBuildTasksGitVersion>
289-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkCommonVersion>
290-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkAzureReposGitVersion>
291-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitHubVersion>
292-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitLabVersion>
293-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkBitbucketGitVersion>
288+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24603.2</MicrosoftBuildTasksGitVersion>
289+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkCommonVersion>
290+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkAzureReposGitVersion>
291+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkGitHubVersion>
292+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkGitLabVersion>
293+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkBitbucketGitVersion>
294294
</PropertyGroup>
295295
<!-- Get .NET Framework reference assemblies from NuGet packages -->
296296
<PropertyGroup>

‎src/SourceBuild/content/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Container contains checked-out source code only
22
{
33
"name": "Default",
4-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
4+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9",
55
"hostRequirements": {
66
// A completely source built .NET is >64 GB with all the repos/artifacts
77
"storage": "128gb"

‎src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Container contains a pre-built SDK
22
{
33
"name": "Pre-built .NET SDK",
4-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
4+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9",
55
"hostRequirements": {
66
// A completely source built .NET is >64 GB with all the repos/artifacts
77
"storage": "128gb"

‎src/SourceBuild/content/repo-projects/Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@
536536
<RepoAssetManifest Include="$(RepoAssetManifestsDir)*.xml" />
537537
</ItemGroup>
538538

539+
<Message Importance="High" Text="$([System.IO.File]::ReadAllText('$(RepoConsoleLogFile)'))" Condition="'@(RepoAssetManifest)' == '' and '$(MinimalConsoleLogOutput)' == 'true' and Exists('$(RepoConsoleLogFile)')" />
539540
<Error Text="No repository asset manifest files found at $(RepoAssetManifestsDir)*.xml. This often means the build failed but did not log an error." Condition="'@(RepoAssetManifest)' == ''" />
540541

541542
<GetKnownArtifactsFromAssetManifests AssetManifests="@(RepoAssetManifest)">

‎src/SourceBuild/patches/wpf/0001-fix-winx86-build.patch‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/VirtualMonoRepo/source-mappings.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
},
113113
{
114114
"name": "scenario-tests",
115-
"defaultRemote": "https://github.com/dotnet/scenario-tests",
116-
"disableSynchronization": true
115+
"defaultRemote": "https://github.com/dotnet/scenario-tests"
117116
},
118117
{
119118
"name": "sdk",

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,32 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
2727
new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist();
2828
}
2929

30-
[Theory]
3130
[InlineData("net7.0")]
3231
[InlineData("net6.0")]
32+
[CoreMSBuildOnlyTheory]
33+
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
34+
{
35+
var testAsset = _testAssetsManager
36+
.CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
37+
.WithSource()
38+
.WithTargetFramework(targetFramework);
39+
40+
var buildCommand = new BuildCommand(testAsset);
41+
// Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
42+
buildCommand.Execute().Should().Pass().And
43+
// warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
44+
.HaveStdOutContaining("warning MSB3002:");
45+
}
46+
47+
[InlineData("net7.0")]
48+
[InlineData("net6.0")]
49+
[FullMSBuildOnlyTheory]
50+
// Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above
51+
//
52+
// Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as
53+
// proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
54+
//
55+
// Microsoft.Common.CurrentVersion.targets(4959,5): error MSB3030: Could not copy the file "obj\Debug\net7.0\test-1\MSBuildCultureResourceGeneration.resources.dll" because it was not found.
3356
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
3457
{
3558
var testAsset = _testAssetsManager

0 commit comments

Comments
 (0)