Skip to content

Enable prebuilt detection #47894

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.

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 9 commits into from
Apr 27, 2023
Merged

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Apr 25, 2023

  • Add some missing depenencies with source-build tags
  • Update baseline
  • Remove some unused NuGet properties
  • Remove old source build workaround
  • Remove explicit reference to Microbuild.Core
  • Pass DotNetBuildFromSource to the repo tasks inner build environment

{PR title}

  • You've read the Contributor Guide and Code of Conduct.
  • You've included unit or integration tests for your change, where applicable.
  • You've included inline docs for your change, where applicable.
  • There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.

Summary of the changes (Less than 80 chars)

Description

{Detail}

Fixes #{bug number} (in this specific format)

mmitche added 2 commits April 25, 2023 16:01
- Add some missing depenencies with source-build tags
- Update baseline
- Remove some unused NuGet properties
- Remove old source build workaround
- Remove explicit reference to Microbuild.Core
- Pass DotNetBuildFromSource to the repo tasks inner build environment
@mmitche mmitche requested review from a team and wtgodbe as code owners April 25, 2023 23:07
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Apr 25, 2023
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />

<!-- These are used in-build for repo-tasks and should come from previously source built -->
<UsagePattern IdentityGlob="NuGet.Common/*6.2.2*" />
Copy link
Member

Choose a reason for hiding this comment

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

Will we have to maintain these hardcoded versions?

Copy link
Member

Choose a reason for hiding this comment

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

Why not use the versions from Versions.props?

Copy link
Member Author

Choose a reason for hiding this comment

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

This isn't loaded by msbuild. They will need to be maintained, but I assume they will not update too often.

Copy link
Member

Choose a reason for hiding this comment

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

Will we see an error if we update the related package versions but don't update these? Want to make sure we don't let it fall behind

@@ -23,6 +23,8 @@
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<!-- Manually updated version from 6.0.0 to address CVE-2021-43877 -->
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
Copy link
Member

Choose a reason for hiding this comment

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

We should property-ize this and put it in Versions.props

Copy link
Member Author

Choose a reason for hiding this comment

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

Done. It differs from the 8.0 version so I chose a different property name

@mmitche
Copy link
Member Author

mmitche commented Apr 27, 2023

@wtgodbe Looking good now.

@mmitche mmitche enabled auto-merge (squash) April 27, 2023 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants