Skip to content

Commit 28d5664

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#44184)
[main] Update dependencies from dotnet/arcade - Fixup xunit test analyzer error - Update VMR bootstrap arcade - Do not add empty source mappings element
1 parent 456aa42 commit 28d5664

File tree

7 files changed

+30
-26
lines changed

7 files changed

+30
-26
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -597,34 +597,34 @@
597597
</Dependency>
598598
</ProductDependencies>
599599
<ToolsetDependencies>
600-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24511.1">
600+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24514.3">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
602+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24511.1">
604+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24514.3">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
606+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24511.1">
608+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24514.3">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
610+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24511.1">
612+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24514.3">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
614+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
615615
</Dependency>
616-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24511.1">
616+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24514.3">
617617
<Uri>https://github.com/dotnet/arcade</Uri>
618-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
618+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
619619
</Dependency>
620-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24511.1">
620+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24514.3">
621621
<Uri>https://github.com/dotnet/arcade</Uri>
622-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
622+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
623623
</Dependency>
624624
<!-- Intermediate is necessary for source build. -->
625-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24511.1">
625+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24514.3">
626626
<Uri>https://github.com/dotnet/arcade</Uri>
627-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
627+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
628628
<SourceBuild RepoName="arcade" ManagedOnly="true" />
629629
</Dependency>
630630
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@
324324
</PropertyGroup>
325325
<PropertyGroup>
326326
<!-- Dependencies from https://github.com/dotnet/arcade -->
327-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24511.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24511.1</MicrosoftDotNetSignToolVersion>
329-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24511.1</MicrosoftDotNetXliffTasksVersion>
330-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24511.1</MicrosoftDotNetXUnitExtensionsVersion>
327+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24514.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24514.3</MicrosoftDotNetSignToolVersion>
329+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24514.3</MicrosoftDotNetXliffTasksVersion>
330+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24514.3</MicrosoftDotNetXUnitExtensionsVersion>
331331
</PropertyGroup>
332332
<PropertyGroup>
333333
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24511.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24514.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24510.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24514.3">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>47bbcb142acb3fa258d204862114a72e085dd788</Sha>
7+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,15 @@ private void AddSourceMappings(XElement pkgSrcMappingElement, string sourceName,
207207
{
208208
pkgSrc = existingPkgSrcElement;
209209
}
210-
else
210+
else if (packagePatterns.Count > 0)
211211
{
212212
pkgSrc = new XElement("packageSource", new XAttribute("key", sourceName));
213213
pkgSrcMappingElement.Add(pkgSrc);
214214
}
215+
else
216+
{
217+
return;
218+
}
215219

216220
foreach (string packagePattern in packagePatterns)
217221
{

‎src/SourceBuild/content/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3"
99
}
1010
}

‎test/Microsoft.DotNet.ApiCompat.IntegrationTests/Task/ValidatePackageTargetIntegrationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void ValidatePackageWithReferences()
146146
{
147147
string testDependencySource = @"namespace PackageValidationTests { public class ItermediateBaseClass
148148
#if NETSTANDARD2_0
149-
: IBaseInterface
149+
: IBaseInterface
150150
#endif
151151
{ } }";
152152

@@ -307,7 +307,7 @@ namespace PackageValidationTests { public class MyForwardedType : ISomeInterface
307307

308308
validator.Validate(new PackageValidatorOption(package));
309309

310-
Assert.Single(log.errors.Where(e => e.Contains("CP1002")));
310+
Assert.Single(log.errors, e => e.Contains("CP1002"));
311311
}
312312

313313
[RequiresMSBuildVersionTheory("17.0.0.32901")]

0 commit comments

Comments
 (0)