Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from microsoft/testfx #45354

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
+31 −9
Open

[main] Update dependencies from microsoft/testfx #45354

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3567fbc
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 6, 2024
75074f1
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 7, 2024
0b0db05
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 8, 2024
43bd55c
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
mariam-abdulla Dec 9, 2024
e78083d
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
mariam-abdulla Dec 9, 2024
bca696e
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 9, 2024
fe48022
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
ViktorHofer Dec 10, 2024
0de324d
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 10, 2024
b9a5398
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
mariam-abdulla Dec 11, 2024
989bc0a
add xml entry for source build
nohwnd Dec 11, 2024
5cff55f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 11, 2024
6544674
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
ViktorHofer Dec 12, 2024
672b160
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 12, 2024
8d001c7
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
ViktorHofer Dec 12, 2024
17a1dff
Add Microsoft.SourceBuild.Intermediate.testfx dependency
ViktorHofer Dec 12, 2024
05140fb
Update testfx repository URL in Version.Details.xml
ViktorHofer Dec 12, 2024
f81ec53
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 13, 2024
346ae0c
Add testfx repo dependency to sdk
ViktorHofer Dec 13, 2024
a5576cc
Add testfx project
ViktorHofer Dec 13, 2024
06b31cb
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 14, 2024
499716f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 15, 2024
f69cfff
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 16, 2024
f724df6
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 17, 2024
1437c92
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
marcpopMSFT Dec 18, 2024
f70848c
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
v-wuzhai Dec 23, 2024
b31446c
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
v-wuzhai Jan 6, 2025
fd9be97
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
v-wuzhai Jan 8, 2025
0726bfb
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
ViktorHofer Jan 8, 2025
15d542e
Remove test-templates repository reference
ViktorHofer Jan 8, 2025
f5693c2
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
Forgind Jan 9, 2025
b4e5526
Merge branch 'main' into darc-main-49744c99-7212-4722-880e-34f8c67032e1
akoeplinger Jan 10, 2025
d4063ac
Make testfx a product dependency and align versions
akoeplinger Jan 10, 2025
b95459a
Turn off warnaserror in testfx
akoeplinger Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,13 +664,19 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Platform" Version="1.5.0-preview.24604.7">
<Dependency Name="Microsoft.Testing.Platform" Version="1.6.0-preview.24612.7">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>52bcabf439b2a01c351efee014054ba09d68544b</Sha>
<Sha>c416216024f123628851eaeea140337fce533470</Sha>
</Dependency>
<Dependency Name="MSTest" Version="3.7.0-preview.24604.7">
<Dependency Name="MSTest" Version="3.8.0-preview.24612.7">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>52bcabf439b2a01c351efee014054ba09d68544b</Sha>
<Sha>c416216024f123628851eaeea140337fce533470</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.testfx" Version="3.8.0-preview.24612.7">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>c416216024f123628851eaeea140337fce533470</Sha>
<SourceBuild RepoName="testfx" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
<MicrosoftTestingPlatformVersion>1.5.0-preview.24604.7</MicrosoftTestingPlatformVersion>
<MicrosoftTestingPlatformVersion>1.6.0-preview.24612.7</MicrosoftTestingPlatformVersion>
</PropertyGroup>
<PropertyGroup Label="Servicing version information">
<VersionFeature21>30</VersionFeature21>
Expand Down Expand Up @@ -300,7 +300,7 @@
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MoqPackageVersion>4.18.4</MoqPackageVersion>
<MSTestVersion>3.7.0-preview.24604.7</MSTestVersion>
<MSTestVersion>3.8.0-preview.24612.7</MSTestVersion>
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/SourceBuild/content/repo-projects/sdk.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<RepositoryReference Include="symreader" />
<RepositoryReference Include="templating" />
<RepositoryReference Include="test-templates" />
<RepositoryReference Include="testfx" />
<RepositoryReference Include="vstest" />
<RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
<RepositoryReference Include="xdt" />
Expand Down
Loading