Skip to content

Commit 54d886a

Browse files
authored
Merge branch 'main' into locfiles/3c25d773-b0fa-4e65-9675-ea05102edfb0
2 parents 2084b1a + 3b265bf commit 54d886a

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<packageSources>
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
9+
<!-- Begin: Package sources from microsoft-testfx -->
10+
<add key="darc-pub-microsoft-testfx-2bec154" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-testfx-2bec1546/nuget/v3/index.json" />
11+
<!-- End: Package sources from microsoft-testfx -->
912
<!-- Begin: Package sources from vs-code-coverage -->
1013
<!-- End: Package sources from vs-code-coverage -->
1114
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25479.7">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25504.3">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>34019881836f80da952b9e5cb702bebf7b5362c6</Sha>
6+
<Sha>db534d10fc5ab858568b2f27d9b1383099a8019c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25479.7">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25504.3">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>34019881836f80da952b9e5cb702bebf7b5362c6</Sha>
10+
<Sha>db534d10fc5ab858568b2f27d9b1383099a8019c</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25479.7">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25504.3">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>34019881836f80da952b9e5cb702bebf7b5362c6</Sha>
14+
<Sha>db534d10fc5ab858568b2f27d9b1383099a8019c</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0-preview.25502.1">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
@@ -21,9 +21,9 @@
2121
<Uri>https://github.com/microsoft/testfx</Uri>
2222
<Sha>86355ce30b293314485eaae50e3e7065b9c50f96</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Testing.Platform" Version="2.0.0-preview.25503.1">
24+
<Dependency Name="Microsoft.Testing.Platform" Version="2.0.0">
2525
<Uri>https://github.com/microsoft/testfx</Uri>
26-
<Sha>86355ce30b293314485eaae50e3e7065b9c50f96</Sha>
26+
<Sha>2bec15462381649ff4b770577e7b8b3bbba5ea12</Sha>
2727
</Dependency>
2828
</ToolsetDependencies>
2929
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25479.7</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftTestingExtensionsCodeCoverageVersion>18.1.0-preview.25502.1</MicrosoftTestingExtensionsCodeCoverageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25504.3</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftTestingExtensionsCodeCoverageVersion>18.1.0</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.0.0-preview.25503.1</MSTestVersion>
14-
<MicrosoftTestingPlatformVersion>2.0.0-preview.25503.1</MicrosoftTestingPlatformVersion>
14+
<MicrosoftTestingPlatformVersion>2.0.0</MicrosoftTestingPlatformVersion>
1515
</PropertyGroup>
1616
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"runner": "Microsoft.Testing.Platform"
3737
},
3838
"msbuild-sdks": {
39-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25479.7",
39+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25504.3",
4040
"MSBuild.Sdk.Extras": "3.0.44"
4141
}
4242
}

0 commit comments

Comments
 (0)