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

Jump to bottom

[automated] Merge branch 'vs17.9' => 'main' #9525

Merged
merged 3 commits into from
Dec 13, 2023
Merged

[automated] Merge branch 'vs17.9' => 'main' #9525

merged 3 commits into from
Dec 13, 2023

Commits on Dec 12, 2023

  1. Unset NUGET_PACKAGES in official build only (dotnet#9523) 

    The devdiv build machine images appear to have started setting the
environment variable `NUGET_PACKAGES`, which caused a mismatch between
the location where `drop.app` was restored (repo-local location) and
where it was used from (environment-variable defined machine location),
causing build failures.

Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>
    @rainersigwald @AR-May
    rainersigwald and AR-May authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    67d742f View commit details
    Browse the repository at this point in the history

  2. Revert "Shorten UTD marker file (dotnet#9387)" except Microsoft.Commo… 

    …n.CurrentVersion.targets (dotnet#9520)

dotnet#9387 introduced improved hashing for [`[MSBuild]::StableStringHash`](https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=vs-2022#msbuild-stablestringhash), that however broke internal functionality relying on the hash to be stable between versions (despite documented otherwise).

### Changes Made
 * Reverted all the hashing changes
 * Kept the UTD marker change (fixing dotnet#9346)

### Note
Longer term fix: dotnet#9519
    @JanKrivanek
    JanKrivanek authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5af9301 View commit details
    Browse the repository at this point in the history

  3. Add VersionOverride to XSD for PackageReference elements (dotnet#9473) 

    NuGet's Central Package Management (CPM) allows users to specify package versions in a central location.  However, sometimes you may need to override the centrally defined version for a particular package so you specify the `VersionOverride` attribute documented [here](https://learn.microsoft.com/nuget/consume-packages/Central-Package-Management#overriding-package-versions).

Fixes AB#1929252.
    @jeffkl
    jeffkl authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b2016b8 View commit details
    Browse the repository at this point in the history