Skip to content

Commit 139cc14

Browse files
nagilsonnagilson
authored
Merge branch 'main' into darc-main-1be9c329-c6a5-4987-87e6-cfb95ef3bf8b
2 parents c85f4cf + 3a4b0c4 commit 139cc14

12 files changed

+447
-424
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: 118 additions & 118 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
3030
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
32-
<MicrosoftTestingPlatformVersion>1.5.0-preview.24602.2</MicrosoftTestingPlatformVersion>
32+
<MicrosoftTestingPlatformVersion>1.5.0-preview.24604.3</MicrosoftTestingPlatformVersion>
3333
</PropertyGroup>
3434
<PropertyGroup Label="Servicing version information">
3535
<VersionFeature21>30</VersionFeature21>
@@ -160,18 +160,18 @@
160160
</PropertyGroup>
161161
<PropertyGroup>
162162
<!-- Dependencies from https://github.com/nuget/nuget.client -->
163-
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackageVersion>
164-
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.73</NuGetBuildTasksConsolePackageVersion>
165-
<NuGetLocalizationPackageVersion>6.13.0-preview.1.73</NuGetLocalizationPackageVersion>
166-
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.73</NuGetBuildTasksPackPackageVersion>
167-
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.73</NuGetCommandLineXPlatPackageVersion>
168-
<NuGetProjectModelPackageVersion>6.13.0-preview.1.73</NuGetProjectModelPackageVersion>
169-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.73</MicrosoftBuildNuGetSdkResolverPackageVersion>
170-
<NuGetCommonPackageVersion>6.13.0-preview.1.73</NuGetCommonPackageVersion>
171-
<NuGetConfigurationPackageVersion>6.13.0-preview.1.73</NuGetConfigurationPackageVersion>
172-
<NuGetFrameworksPackageVersion>6.13.0-preview.1.73</NuGetFrameworksPackageVersion>
173-
<NuGetPackagingPackageVersion>6.13.0-preview.1.73</NuGetPackagingPackageVersion>
174-
<NuGetVersioningPackageVersion>6.13.0-preview.1.73</NuGetVersioningPackageVersion>
163+
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.84</NuGetBuildTasksPackageVersion>
164+
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.84</NuGetBuildTasksConsolePackageVersion>
165+
<NuGetLocalizationPackageVersion>6.13.0-preview.1.84</NuGetLocalizationPackageVersion>
166+
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.84</NuGetBuildTasksPackPackageVersion>
167+
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.84</NuGetCommandLineXPlatPackageVersion>
168+
<NuGetProjectModelPackageVersion>6.13.0-preview.1.84</NuGetProjectModelPackageVersion>
169+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.84</MicrosoftBuildNuGetSdkResolverPackageVersion>
170+
<NuGetCommonPackageVersion>6.13.0-preview.1.84</NuGetCommonPackageVersion>
171+
<NuGetConfigurationPackageVersion>6.13.0-preview.1.84</NuGetConfigurationPackageVersion>
172+
<NuGetFrameworksPackageVersion>6.13.0-preview.1.84</NuGetFrameworksPackageVersion>
173+
<NuGetPackagingPackageVersion>6.13.0-preview.1.84</NuGetPackagingPackageVersion>
174+
<NuGetVersioningPackageVersion>6.13.0-preview.1.84</NuGetVersioningPackageVersion>
175175
</PropertyGroup>
176176
<PropertyGroup>
177177
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -181,8 +181,8 @@
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
184-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24602.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
185-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24602.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
184+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24603.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
185+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24603.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
186186
</PropertyGroup>
187187
<PropertyGroup>
188188
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -199,19 +199,19 @@
199199
then use that in Directory.Packages.props.
200200
201201
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
202-
<MicrosoftBuildVersion>17.13.0-preview-24568-05</MicrosoftBuildVersion>
203-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24568-05</MicrosoftBuildLocalizationVersion>
202+
<MicrosoftBuildVersion>17.13.0-preview-24604-04</MicrosoftBuildVersion>
203+
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24604-04</MicrosoftBuildLocalizationVersion>
204204
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
205205
</PropertyGroup>
206206
<PropertyGroup>
207207
<!-- Dependencies from https://github.com/dotnet/templating -->
208-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24601.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
208+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24603.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
209209
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
210210
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
211211
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
212212
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
213213
<!-- test dependencies -->
214-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24601.1</MicrosoftTemplateEngineMocksPackageVersion>
214+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24603.1</MicrosoftTemplateEngineMocksPackageVersion>
215215
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
216216
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
217217
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -233,25 +233,25 @@
233233
</PropertyGroup>
234234
<PropertyGroup>
235235
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
236-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRefPackageVersion>
237-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
238-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
239-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
240-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreTestHostPackageVersion>
243-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
244-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24602.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
245-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24602.4</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
246-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24602.4</dotnetdevcertsPackageVersion>
247-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24602.4</dotnetuserjwtsPackageVersion>
248-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24602.4</dotnetusersecretsPackageVersion>
236+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreAppRefPackageVersion>
237+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
238+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
239+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
240+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreTestHostPackageVersion>
243+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
244+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24604.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
245+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24604.2</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
246+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24604.2</dotnetdevcertsPackageVersion>
247+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24604.2</dotnetuserjwtsPackageVersion>
248+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24604.2</dotnetusersecretsPackageVersion>
249249
</PropertyGroup>
250250
<PropertyGroup>
251251
<!-- Dependencies from https://github.com/dotnet/razor -->
252-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24602.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
253-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24602.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
254-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24602.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
252+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24604.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
253+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24604.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
254+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24604.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
255255
</PropertyGroup>
256256
<PropertyGroup>
257257
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -283,12 +283,12 @@
283283
</PropertyGroup>
284284
<PropertyGroup>
285285
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
286-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24577.2</MicrosoftBuildTasksGitVersion>
287-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkCommonVersion>
288-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkAzureReposGitVersion>
289-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitHubVersion>
290-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkGitLabVersion>
291-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24577.2</MicrosoftSourceLinkBitbucketGitVersion>
286+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24603.2</MicrosoftBuildTasksGitVersion>
287+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkCommonVersion>
288+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkAzureReposGitVersion>
289+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkGitHubVersion>
290+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkGitLabVersion>
291+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24603.2</MicrosoftSourceLinkBitbucketGitVersion>
292292
</PropertyGroup>
293293
<!-- Get .NET Framework reference assemblies from NuGet packages -->
294294
<PropertyGroup>

‎src/Layout/redist/targets/GenerateLayout.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@
113113
</PropertyGroup>
114114

115115
<ItemGroup>
116-
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)//$(NetCurrent)/**/*.dll" />
116+
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.dll" />
117+
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.exe" />
117118
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.json" />
118119
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.config" />
119120
</ItemGroup>

‎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)