Merge pull request #1707: Merge milestones/M180 into releases/shipped

The only functional behavior change is from #1706 which includes the GCM Core update. This also includes #1703 which deleted the macOS projects, but doesn't change the Windows executable.
microsoft · Dec 9, 2020 · 42e3d72 · 42e3d72
2 parents 0e417a0 + a292600
commit 42e3d72
Show file tree

Hide file tree

Showing 154 changed files with 1 addition and 21,319 deletions.
diff --git a/.azure-pipelines/templates/macos-build-and-unit-test.yml b/.azure-pipelines/templates/macos-build-and-unit-test.yml
diff --git a/.azure-pipelines/templates/macos-functional-test.yml b/.azure-pipelines/templates/macos-functional-test.yml
diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <GVFSVersion>0.2.173.2</GVFSVersion>
-    <GitPackageVersion>2.20201020.1</GitPackageVersion>
+    <GitPackageVersion>2.20201209.2</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/GVFS/GVFS.Installer.Mac/CreateMacInstaller.sh b/GVFS/GVFS.Installer.Mac/CreateMacInstaller.sh