Skip to content

Commit 3b18317

Browse files
authored
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-d5e70d62-80a9-432c-8bad-50dceb349e82
2 parents f7a943b + eeebc2d commit 3b18317

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1018
-1018
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ This file should be imported by eng/Versions.props
140140
<!-- dotnet/core-setup dependencies -->
141141
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
142142
<!-- microsoft/testfx dependencies -->
143-
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25452.4</MicrosoftTestingPlatformPackageVersion>
144-
<MSTestPackageVersion>3.11.0-preview.25452.4</MSTestPackageVersion>
143+
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25453.10</MicrosoftTestingPlatformPackageVersion>
144+
<MSTestPackageVersion>3.11.0-preview.25453.10</MSTestPackageVersion>
145145
</PropertyGroup>
146146
<!--Property group for alternate package version names-->
147147
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,13 +553,13 @@
553553
<Uri>https://github.com/dotnet/dotnet</Uri>
554554
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
555555
</Dependency>
556-
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25452.4">
556+
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25453.10">
557557
<Uri>https://github.com/microsoft/testfx</Uri>
558-
<Sha>0d5aa69d6b2cbeebff30536a22d31f4bd7ecf684</Sha>
558+
<Sha>684f40affad7afc91e8a960cc64ebf12bc25a3d1</Sha>
559559
</Dependency>
560-
<Dependency Name="MSTest" Version="3.11.0-preview.25452.4">
560+
<Dependency Name="MSTest" Version="3.11.0-preview.25453.10">
561561
<Uri>https://github.com/microsoft/testfx</Uri>
562-
<Sha>0d5aa69d6b2cbeebff30536a22d31f4bd7ecf684</Sha>
562+
<Sha>684f40affad7afc91e8a960cc64ebf12bc25a3d1</Sha>
563563
</Dependency>
564564
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.2.25427.104">
565565
<Uri>https://github.com/dotnet/dotnet</Uri>

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.cs.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.de.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.es.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.fr.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.it.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ja.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ko.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pl.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)