Merge pull request #16: Update pull-request.yml for Azure Pipelines

Makes progress towards #3 by fixing the Windows build and having it run as a PR check via YAML.
microsoft · Aug 8, 2019 · 40bc492 · 40bc492
2 parents 7517427 + a0de275
commit 40bc492
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 176 deletions.
diff --git a/.azure-pipelines/pull-request.yml b/.azure-pipelines/pull-request.yml
@@ -2,6 +2,12 @@ name: $(date:yy)$(DayOfYear)$(rev:.r)
 
 trigger: none
 
+pr:
+- master
+- milestones/*
+- releases/*
+- servicing/*
+
 variables:
   majorAndMinorVersion: '0.4'
   revision: '$(Build.BuildNumber)'
@@ -15,8 +21,8 @@ jobs:
     steps:
     - template: templates/windows-build-and-unit-test.yml
 
-  - job: macOS
-    pool:
-      vmImage: macOS 10.13
-    steps:
-    - template: templates/macos-build-and-unit-test.yml
+  #- job: macOS
+  #  pool:
+  #    vmImage: macOS 10.13
+  #  steps:
+  #  - template: templates/macos-build-and-unit-test.yml
diff --git a/.azure-pipelines/templates/macos-build-and-unit-test.yml b/.azure-pipelines/templates/macos-build-and-unit-test.yml
@@ -9,9 +9,6 @@ steps:
   - script: Scripts/Mac/BuildGVFSForMac.sh $(configuration)
     displayName: Build VFSForGit $(configuration)
 
-  - script: MirrorProvider/Scripts/Mac/Build.sh $(configuration)
-    displayName: Build MirrorProvider $(configuration)
-
   - task: PublishTestResults@2
     displayName: Publish test results
     inputs:
@@ -22,14 +19,14 @@ steps:
       publishRunAttachments: true
     condition: succeededOrFailed()
 
-  - script: Scripts/Mac/CI/CreateBuildDrop.sh $(configuration) $(Build.ArtifactStagingDirectory)/Tests
-    displayName: Create functional test drop.
+  #- script: Scripts/Mac/CI/CreateBuildDrop.sh $(configuration) $(Build.ArtifactStagingDirectory)/Tests
+  #  displayName: Create functional test drop.
 
-  - task: PublishBuildArtifacts@1
-    displayName: Publish functional test drop artifact.
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/Tests
-      artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
-      parallel: true
-      parallelCount: 8
-    condition: succeededOrFailed()
+  #- task: PublishBuildArtifacts@1
+  #  displayName: Publish functional test drop artifact.
+  #  inputs:
+  #    pathtoPublish: $(Build.ArtifactStagingDirectory)/Tests
+  #    artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
+  #    parallel: true
+  #    parallelCount: 8
+  #  condition: succeededOrFailed()
diff --git a/.azure-pipelines/templates/windows-build-and-unit-test.yml b/.azure-pipelines/templates/windows-build-and-unit-test.yml
@@ -12,29 +12,26 @@ steps:
   - script: $(Build.Repository.LocalPath)\Scripts\BuildGVFSForWindows.bat $(configuration) $(majorAndMinorVersion).$(revision)
     displayName: Run VFSForGit build script ($(configuration))
 
-  - script: $(Build.Repository.LocalPath)\MirrorProvider\Scripts\Windows\Build.bat $(configuration)
-    displayName: Build MirrorProvider ($(configuration))
-
   - script: $(Build.Repository.LocalPath)\Scripts\RunUnitTests.bat $(configuration)
     displayName: Run unit tests
 
-  - task: PublishTestResults@2
-    displayName: Publish unit test results
-    inputs:
-      testRunner: NUnit
-      testResultsFiles: "**\\TestResult.xml"
-      searchFolder: $(System.DefaultWorkingDirectory)
-      testRunTitle: Windows $(configuration) Unit Tests
-      publishRunAttachments: true
-
-  - script: $(Build.Repository.LocalPath)\Scripts\CI\CreateBuildDrop.bat $(configuration) $(Build.ArtifactStagingDirectory)\Tests
-    displayName: Create functional test drop.
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish functional test drop artifact.
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)\Tests
-      artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
-      parallel: true
-      parallelCount: 8
-    condition: succeededOrFailed()
+  #- task: PublishTestResults@2
+  #  displayName: Publish unit test results
+  #  inputs:
+  #    testRunner: NUnit
+  #    testResultsFiles: "**\\TestResult.xml"
+  #    searchFolder: $(System.DefaultWorkingDirectory)
+  #    testRunTitle: Windows $(configuration) Unit Tests
+  #    publishRunAttachments: true
+
+  #- script: $(Build.Repository.LocalPath)\Scripts\CI\CreateBuildDrop.bat $(configuration) $(Build.ArtifactStagingDirectory)\Tests
+  #  displayName: Create functional test drop.
+
+  #- task: PublishBuildArtifacts@1
+  #  displayName: Publish functional test drop artifact.
+  #  inputs:
+  #    pathtoPublish: $(Build.ArtifactStagingDirectory)\Tests
+  #    artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
+  #    parallel: true
+  #    parallelCount: 8
+  #  condition: succeededOrFailed()
diff --git a/GVFS/GVFS.Common/GVFSPlatform.cs b/GVFS/GVFS.Common/GVFSPlatform.cs
@@ -179,16 +179,6 @@ public string GVFSReadObjectHookExecutableName
                 get { return "GVFS.ReadObjectHook" + this.ExecutableExtension; }
             }
 
-            public string GVFSVirtualFileSystemHookExecutableName
-            {
-                get { return "GVFS.VirtualFileSystemHook" + this.ExecutableExtension; }
-            }
-
-            public string GVFSPostIndexChangedHookExecutableName
-            {
-                get { return "GVFS.PostIndexChangedHook" + this.ExecutableExtension; }
-            }
-
             public string MountExecutableName
             {
                 get { return "GVFS.Mount" + this.ExecutableExtension; }
@@ -215,6 +205,6 @@ public UnderConstructionFlags(
             public bool SupportsGVFSUpgrade { get; }
             public bool SupportsGVFSConfig { get; }
             public bool SupportsNuGetEncryption { get; }
-        }
-    }
+        }
+    }
 }
diff --git a/GVFS/GVFS.Installer.Windows/Setup.iss b/GVFS/GVFS.Installer.Windows/Setup.iss
@@ -12,8 +12,6 @@
 #define ServiceUIDir BuildOutputDir + "\GVFS.Service.UI\bin\" + PlatformAndConfiguration
 #define GVFSMountDir BuildOutputDir + "\GVFS.Mount.Windows\bin\" + PlatformAndConfiguration
 #define ReadObjectDir BuildOutputDir + "\GVFS.ReadObjectHook.Windows\bin\" + PlatformAndConfiguration
-#define VirtualFileSystemDir BuildOutputDir + "\GVFS.VirtualFileSystemHook.Windows\bin\" + PlatformAndConfiguration
-#define PostIndexChangedDir BuildOutputDir + "\GVFS.PostIndexChangedHook.Windows\bin\" + PlatformAndConfiguration
 #define GVFSUpgraderDir BuildOutputDir + "\GVFS.Upgrader\bin\" + PlatformAndConfiguration + "\net461"
 
 #define MyAppName "GVFS"
@@ -68,12 +66,6 @@ Name: "full"; Description: "Full installation"; Flags: iscustom;
 Type: files; Name: "{app}\ucrtbase.dll"
 
 [Files]
-; GitHooks Files
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#HooksDir}\GVFS.Hooks.pdb"
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#HooksDir}\GVFS.Hooks.exe"
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#HooksDir}\GVFS.Hooks.exe.config"
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#HooksLoaderDir}\GitHooksLoader.pdb"
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#HooksLoaderDir}\GitHooksLoader.exe"
 
 ; GVFS.Common Files
 DestDir: "{app}"; Flags: ignoreversion; Source:"{#GVFSCommonDir}\git2.dll"

diff --git a/GVFS/GVFS.Mount/GVFS.Mount.Windows.csproj b/GVFS/GVFS.Mount/GVFS.Mount.Windows.csproj
@@ -108,10 +108,7 @@
     <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /Y $(BuildOutputDir)\GVFS.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.ReadObjectHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.VirtualFileSystemHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.VirtualFileSystemHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.PostIndexChangedHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.PostIndexChangedHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.Hooks.Windows\bin\$(Platform)\$(Configuration)\GVFS.Hooks.* $(TargetDir)</PostBuildEvent>
+    <PostBuildEvent>xcopy /Y $(BuildOutputDir)\GVFS.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.ReadObjectHook.* $(TargetDir)</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
   <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />

diff --git a/GVFS/GVFS.Native.Mac/GVFS.Native.Mac.xcworkspace/contents.xcworkspacedata b/GVFS/GVFS.Native.Mac/GVFS.Native.Mac.xcworkspace/contents.xcworkspacedata
diff --git a/...FS.Native.Mac/GVFS.Native.Mac.xcworkspace/xcshareddata/xcschemes/GVFS.Native.Mac.xcscheme b/...FS.Native.Mac/GVFS.Native.Mac.xcworkspace/xcshareddata/xcschemes/GVFS.Native.Mac.xcscheme
@@ -6,20 +6,6 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "267A836720EE9F27005E6B60"
-               BuildableName = "GVFS.VirtualFileSystemHook"
-               BlueprintName = "GVFS.VirtualFileSystemHook"
-               ReferencedContainer = "container:../GVFS.VirtualFileSystemHook/GVFS.VirtualFileSystemHook.Mac.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -34,84 +20,8 @@
                ReferencedContainer = "container:../GVFS.ReadObjectHook/GVFS.ReadObjectHook.Mac.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "267A836720EE9F27005E6B60"
-               BuildableName = "GVFS.PostIndexChangedHook"
-               BlueprintName = "GVFS.PostIndexChangedHook"
-               ReferencedContainer = "container:../GVFS.PostIndexChangedHook/GVFS.PostIndexChangedHook.Mac.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "267A836720EE9F27005E6B60"
-            BuildableName = "GVFS.VirtualFileSystemHook"
-            BlueprintName = "GVFS.VirtualFileSystemHook"
-            ReferencedContainer = "container:../GVFS.VirtualFileSystemHook/GVFS.VirtualFileSystemHook.Mac.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <PathRunnable
-         runnableDebuggingMode = "0"
-         FilePath = "/&lt;placeholder&gt;">
-      </PathRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "267A836720EE9F27005E6B60"
-            BuildableName = "GVFS.VirtualFileSystemHook"
-            BlueprintName = "GVFS.VirtualFileSystemHook"
-            ReferencedContainer = "container:../GVFS.VirtualFileSystemHook/GVFS.VirtualFileSystemHook.Mac.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "267A836720EE9F27005E6B60"
-            BuildableName = "GVFS.VirtualFileSystemHook"
-            BlueprintName = "GVFS.VirtualFileSystemHook"
-            ReferencedContainer = "container:../GVFS.VirtualFileSystemHook/GVFS.VirtualFileSystemHook.Mac.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
    </AnalyzeAction>

diff --git a/GVFS/GVFS.SignFiles/GVFS.SignFiles.csproj b/GVFS/GVFS.SignFiles/GVFS.SignFiles.csproj
@@ -35,9 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <FilesToSign Include="
-      $(BuildOutputDir)\GitHooksLoader\bin\$(Platform)\$(Configuration)\GitHooksLoader.exe;
       $(BuildOutputDir)\GVFS.Common\bin\$(Platform)\$(Configuration)\netstandard2.0\GVFS.Common.dll;
-      $(BuildOutputDir)\GVFS.Hooks.Windows\bin\$(Platform)\$(Configuration)\GVFS.Hooks.exe;
       $(BuildOutputDir)\GVFS.Mount.Windows\bin\$(Platform)\$(Configuration)\GVFS.Mount.exe;
       $(BuildOutputDir)\GVFS.Platform.Windows\bin\$(Platform)\$(Configuration)\GVFS.Platform.Windows.dll;
       $(BuildOutputDir)\GVFS.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.ReadObjectHook.exe;

diff --git a/GVFS/GVFS/GVFS.Windows.csproj b/GVFS/GVFS/GVFS.Windows.csproj
@@ -160,11 +160,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /Y $(BuildOutputDir)\GVFS.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.ReadObjectHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.VirtualFileSystemHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.VirtualFileSystemHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.PostIndexChangedHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.PostIndexChangedHook.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GVFS.Hooks.Windows\bin\$(Platform)\$(Configuration)\GVFS.Hooks.* $(TargetDir)
-xcopy /Y $(BuildOutputDir)\GitHooksLoader\bin\$(Platform)\$(Configuration)\GitHooksLoader.* $(TargetDir)</PostBuildEvent>
+    <PostBuildEvent>xcopy /Y $(BuildOutputDir)\GVFS.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\GVFS.ReadObjectHook.* $(TargetDir)</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/GitHooksLoader/Version.rc b/GitHooksLoader/Version.rc
diff --git a/GitHooksLoader/resource.h b/GitHooksLoader/resource.h
diff --git a/Scripts/RunFunctionalTests.bat b/Scripts/RunFunctionalTests.bat
@@ -9,23 +9,15 @@ SET PATH=C:\Program Files\GVFS;C:\Program Files\Git\cmd;%PATH%
 if not "%2"=="--test-gvfs-on-path" goto :startFunctionalTests
 
 REM Force GVFS.FunctionalTests.exe to use the installed version of GVFS
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GitHooksLoader.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.Hooks.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.ReadObjectHook.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.VirtualFileSystemHook.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.PostIndexChangedHook.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.Mount.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.Service.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests\bin\x64\%Configuration%\netcoreapp2.1\GVFS.Service.UI.exe
 
 REM Same for GVFS.FunctionalTests.Windows.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GitHooksLoader.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.Hooks.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.ReadObjectHook.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.VirtualFileSystemHook.exe
-del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.PostIndexChangedHook.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.Mount.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.Service.exe
 del %VFS_OUTPUTDIR%\GVFS.FunctionalTests.Windows\bin\x64\%Configuration%\GVFS.Service.UI.exe