Skip to content

Commit 0dc115c

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 46937: [internal/release/9.0.2xx] Merge from public
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary
2 parents 60dbfdd + 3c7fc88 commit 0dc115c

File tree

4 files changed

+43
-19
lines changed

4 files changed

+43
-19
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<add key="darc-pub-dotnet-emsdk-2c27e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405/nuget/v3/index.json" />
1616
<!-- End: Package sources from dotnet-emsdk -->
1717
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
18+
<add key="darc-pub-DotNet-msbuild-Trusted-cbc39be" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-cbc39bea/nuget/v3/index.json" />
1819
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1920
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2021
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,28 @@
6969
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24569-04">
72+
<Dependency Name="Microsoft.Build" Version="17.13.8">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
74+
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24569-04">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.8-preview-25070-17">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
78+
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24569-04">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.8-preview-25070-17">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
83+
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
86-
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.25056.5">
86+
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.201-beta.25070.3">
8787
<Uri>https://github.com/dotnet/fsharp</Uri>
88-
<Sha>63a09289745da5c256e7baf5f4194a750b1ec878</Sha>
88+
<Sha>3d780e06fbae1bc106cb90088fa9605ea4a42eed</Sha>
8989
</Dependency>
9090
<!-- Intermediate is necessary for source build. -->
91-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.200-beta.25056.5">
91+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.201-beta.25070.3">
9292
<Uri>https://github.com/dotnet/fsharp</Uri>
93-
<Sha>63a09289745da5c256e7baf5f4194a750b1ec878</Sha>
93+
<Sha>3d780e06fbae1bc106cb90088fa9605ea4a42eed</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
9696
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25057.3">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25061.2">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25070.3">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
602+
<Sha>702695802459ffcd11d13cfb73f86aa7b9f6a3ea</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25061.2">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25070.3">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
607+
<Sha>702695802459ffcd11d13cfb73f86aa7b9f6a3ea</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.0-preview-24569-04</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24569-04</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.13.8</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.13.8-preview-25070-17</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>
@@ -198,7 +198,7 @@
198198
</PropertyGroup>
199199
<PropertyGroup>
200200
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
201-
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.25056.5</MicrosoftFSharpCompilerPackageVersion>
201+
<MicrosoftFSharpCompilerPackageVersion>13.9.201-beta.25070.3</MicrosoftFSharpCompilerPackageVersion>
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -259,7 +259,7 @@
259259
<PropertyGroup Label="Infrastructure and test only dependencies">
260260
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
261261
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
262-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25061.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
262+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25070.3</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Manually updated">
265265
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

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