Overhaul build and project systems and drop Mac/POSIX code #1744
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move the GitHooksLoader under the GVFS directory and migrate the project file to v142 toolset (VS2019) and WinSDK10.0.16299. Also migrate project to use new MSBuild properties for the VSF for Git project.
Drop the older custom targets and props files for the new ones.
Replace the GVFS.Build directory and pre-build code with targets and tasks that are better integrated with the rest of the build.
Migrate the native VC++ projects to use the new build variables, package restore, and WinSDK to 10.0.16299.
Also drop the .Windows specific project.. it's all Windows now.
Also combine the GVFS.UnitTests and .Windows projects in to one project (it's all Windows now).
Replace the 'sign files' project with a 'payload' project and script (that gathers binaries for signing).
Migrate the Windows installer project to the new build system, and also use wildcard inclusion of files in the Inno setup.
Simplify solution configurations (we only build on Windows x64 now) and remove solution-level project build order.. we now rely on MSBuild and "real" project-to-project dependencies.
|
Very Nice! |
jeffhostetler
approved these changes
Jun 28, 2021
derrickstolee
approved these changes
Jun 28, 2021
There was a problem hiding this comment.
I mostly have nits that can be ignored or handled later.
Here is my short list of follow-ups that will be unblocked by this PR:
- Update to latest
microsoft/gitrelease (and fix compatibility bugs inmicrosoft/gitbased on that update). - Remove the custom upgrader and have
gvfs upgradeshell out towinget. - Update the release flow to match the new setup.
| including taking version numbers 2.X.Y from upstream and updating .W if we have any | ||
| hotfixes to microsoft/git. | ||
| --> | ||
| <GitPackageVersion>2.20210322.1</GitPackageVersion> |
There was a problem hiding this comment.
Making a mental note to update our internal docs to point to this line.
derrickstolee
added a commit
that referenced
this pull request
Jul 15, 2021
Major Updates ---------------- * Comes with `microsoft/git` v2.32.0.vfs.0.4. * This release will be available via `winget`. * The `gvfs upgrade` verb is deprecated. Any future updates will be taken via `winget`. * This version of Git has an upgrade mechanism that can advance independently of VFS for Git. Run `git update-microsoft-git` to update your Git version. * The build system has been updated to use a more recent version of .NET. * All macOS and POSIX code has been removed to simplify the build system. * A FastFetch bug around deleting files has been fixed. * A prefetch bug around downloading a small number of files has been fixed. Special thanks to contributors @ldennington, @tyrielv, @50Wliu, and @SteveBenz. Pull Requests --------------- * #1738: Bumping version of update-winget action * #1747: UpgradeVerb: write deprecation notice * #1745: do not exit early if no blobs found for a period when prefetching * #1740: Skip launching UI if running unattended * #1737: Update Git to v2.32.0 * #1746: Delete custom upgrader * #1741: Fix winget tag specification * #1744: Overhaul build and project systems and drop Mac/POSIX code * #1736: Update Git to v2.31.1.vfs.0.3 * #1735: Bumping winget action version * #1734: Adding winget workflow * #1733: Update Git to include 2.31.1 * #1730: Fix an issue with FastFetch when deleting files * #1732: Use one NuGet feed * #1726: Config: commitGraph.generationVersion=1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR simplifies and modernises the build system significantly. Move to the new MSBuild project file format for all .NET projects and avoid mixing ecosystems between
dotnet/msbuild,nuget/dotnetandpackages.config/ProjectReference(where possible).All .NET projects target .NET Framework 4.6.1, and we drop all .NET Standard and .NET Core targets.
Native code uses the Windows SDK 10.0.16299 and the VS2019 toolset.
We also drop more/most of the macOS and POSIX code to aid in simplifying the build - VFS for Git on Mac and Linux were abandoned for various reasons.
Functional tests only run against the currently installed VFS for Git (on
%PATH%) and the option to run against the just-built/dev version has been removed (it was not used in practice).Add a GitHub Actions workflow for CI and PR builds. (Also added a YAML-based Azure DevOps pipeline for release builds, but this is not used.. yet).
Notes:
The PR is best reviewed commit-by-commit, but note that each commit does NOT build standalone, and the entire series must be taken as a whole to ensure a successful build.
The majority of the new build design comes from Scalar and GCM Core, so there's some similarities in here to those systems. For example, the
GVFS.MSBuildfiles come pretty much verbatim from theScalar.MSBuildproject in Scalar.