Skip to content

Add dependencies needed for source-build PVP flow #33039

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

Merged
merged 4 commits into from
Jun 8, 2023
Merged

Add dependencies needed for source-build PVP flow #33039

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8191a20
Dependencies needed for source-build PVP flow
NikolaMilosavljevic Jun 5, 2023
c7e51a2
Merge branch 'main' into deps.pvp
NikolaMilosavljevic Jun 6, 2023
66355f8
Merge branch 'main' into deps.pvp
NikolaMilosavljevic Jun 7, 2023
e104fc9
Merge branch 'main' into deps.pvp
NikolaMilosavljevic Jun 8, 2023
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
68 changes: 68 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,83 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c2488eead6ead7208f543d0a57104b5d167b93f9</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Commands" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Common" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Configuration" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.LibraryModel" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.ProjectModel" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Protocol" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Packaging" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.7.0-preview.2.51">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23302.1">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.7.0-preview.23302.1">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha>
</Dependency>
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.7.0-preview.23302.1">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23304.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2bf8f1aa83e192a307d5846424880cd61bec1a4f</Sha>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,25 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.7.0-preview.2.51</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
<NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
<NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
<NuGetBuildTasksPackPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.7.0-preview.2.51</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.7.0-preview.2.51</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.7.0-preview.2.51</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.7.0-preview.2.51</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.7.0-preview.2.51</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.7.0-preview.2.51</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.7.0-preview.2.51</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.7.0-preview.2.51</NuGetVersioningPackageVersion>
<NuGetPackagingVersion>6.7.0-preview.2.51</NuGetPackagingVersion>
<NuGetProjectModelVersion>6.7.0-preview.2.51</NuGetProjectModelVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/vstest -->
<MicrosoftNETTestSdkPackageVersion>17.7.0-preview.23302.1</MicrosoftNETTestSdkPackageVersion>
Copy link
Member

@joeloff joeloff Jun 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the version is explicitly used further down, do we still need the property?

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Jun 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MicrosoftNETTestSdkPackageVersion is used in various places in this repo, we need this property.

<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>17.7.0-preview.23302.1</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>17.7.0-preview.23302.1</MicrosoftTestPlatformBuildPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down