Skip to content

[automated] Merge branch 'vs17.6' => 'main' #8615

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
Mar 30, 2023
Merged

[automated] Merge branch 'vs17.6' => 'main' #8615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b835f79
Prefer sln-defined platforms for command-line builds over dynamic pla…
dfederm Mar 30, 2023
61dd656
Final version branding (#8604)
Forgind Mar 30, 2023
35a4904
Bump version to 17.7 (#8612)
rainersigwald Mar 30, 2023
4c9e8aa
Merge remote-tracking branch 'upstream/vs17.6'
rainersigwald Mar 30, 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
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 @@ -2,8 +2,8 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.6.0</VersionPrefix>
<PackageValidationBaselineVersion>17.5.0-preview-23075-01</PackageValidationBaselineVersion>
<VersionPrefix>17.7.0</VersionPrefix>
<PackageValidationBaselineVersion>17.6.0-preview-23178-11</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,11 +1631,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<UseDefaultPlatformLookupTables Condition="'$(UseDefaultPlatformLookupTables)' == ''">true</UseDefaultPlatformLookupTables>
</PropertyGroup>

<!-- This target skips VS builds because they already supply Platform and
Configuration information. -->
<!-- This target skips sln-based builds because they already supply Platform and
Configuration information. See AssignProjectConfiguration -->
<Target Name="_GetProjectReferencePlatformProperties"
Condition="'$(EnableDynamicPlatformResolution)' == 'true'
and '$(BuildingInsideVisualStudio)' != 'true'
and '$(CurrentSolutionConfigurationContents)' == ''
and '@(_MSBuildProjectReferenceExistent)' != ''">

<!-- Allow preset SetPlatform to override this operation -->
Expand Down