Skip to content

Commit 745f747

Browse files
jrbriggsjrbriggs
authored
Merge pull request #180 from Microsoft/milestones/M139
Merge milestones/M139 to releases/shipped - Status cache - Prefetch in the background
2 parents 785ccb4 + 3884b6b commit 745f747

190 files changed

Lines changed: 5404 additions & 1657 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎GVFS.sln‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.NativeTests", "GVFS\GV
4545
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
4646
EndProjectSection
4747
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Hooks", "GVFS\GVFS.Hooks\GVFS.Hooks.csproj", "{BDA91EE5-C684-4FC5-A90A-B7D677421917}"
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Hooks.Windows", "GVFS\GVFS.Hooks\GVFS.Hooks.Windows.csproj", "{BDA91EE5-C684-4FC5-A90A-B7D677421917}"
4949
ProjectSection(ProjectDependencies) = postProject
5050
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
5151
EndProjectSection
@@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Service", "GVFS\GVFS.S
5757
{BDA91EE5-C684-4FC5-A90A-B7D677421917} = {BDA91EE5-C684-4FC5-A90A-B7D677421917}
5858
EndProjectSection
5959
EndProject
60-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.ReadObjectHook", "GVFS\GVFS.ReadObjectHook\GVFS.ReadObjectHook.vcxproj", "{5A6656D5-81C7-472C-9DC8-32D071CB2258}"
60+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.ReadObjectHook", "GVFS\GVFS.ReadObjectHook\GVFS.ReadObjectHook.Windows.vcxproj", "{5A6656D5-81C7-472C-9DC8-32D071CB2258}"
6161
ProjectSection(ProjectDependencies) = postProject
6262
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
6363
EndProjectSection
@@ -106,7 +106,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.SignFiles", "GVFS\GVFS
106106
{93B403FD-DAFB-46C5-9636-B122792A548A} = {93B403FD-DAFB-46C5-9636-B122792A548A}
107107
EndProjectSection
108108
EndProject
109-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.VirtualFileSystemHook", "GVFS\GVFS.VirtualFileSystemHook\GVFS.VirtualFileSystemHook.vcxproj", "{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}"
109+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.VirtualFileSystemHook", "GVFS\GVFS.VirtualFileSystemHook\GVFS.VirtualFileSystemHook.Windows.vcxproj", "{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}"
110110
ProjectSection(ProjectDependencies) = postProject
111111
{A4984251-840E-4622-AD0C-66DFCE2B2574} = {A4984251-840E-4622-AD0C-66DFCE2B2574}
112112
EndProjectSection
@@ -165,6 +165,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.FunctionalTests", "GVF
165165
EndProject
166166
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.FunctionalTests.LockHolder", "GVFS\GVFS.FunctionalTests.LockHolder\GVFS.FunctionalTests.LockHolder.csproj", "{FA273F69-5762-43D8-AEA1-B4F08090D624}"
167167
EndProject
168+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Hooks.Mac", "GVFS\GVFS.Hooks\GVFS.Hooks.Mac.csproj", "{4CC2A90D-D240-4382-B4BF-5E175515E492}"
169+
EndProject
168170
Global
169171
GlobalSection(SolutionConfigurationPlatforms) = preSolution
170172
Debug.Mac|x64 = Debug.Mac|x64
@@ -359,6 +361,14 @@ Global
359361
{FA273F69-5762-43D8-AEA1-B4F08090D624}.Release.Mac|x64.ActiveCfg = Release|x64
360362
{FA273F69-5762-43D8-AEA1-B4F08090D624}.Release.Windows|x64.ActiveCfg = Release|x64
361363
{FA273F69-5762-43D8-AEA1-B4F08090D624}.Release.Windows|x64.Build.0 = Release|x64
364+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Debug.Mac|x64.ActiveCfg = Debug|x64
365+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Debug.Mac|x64.Build.0 = Debug|x64
366+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Debug.Windows|x64.ActiveCfg = Debug|x64
367+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Debug.Windows|x64.Build.0 = Debug|x64
368+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Mac|x64.ActiveCfg = Release|x64
369+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Mac|x64.Build.0 = Release|x64
370+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Windows|x64.ActiveCfg = Release|x64
371+
{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Windows|x64.Build.0 = Release|x64
362372
EndGlobalSection
363373
GlobalSection(SolutionProperties) = preSolution
364374
HideSolutionNode = FALSE
@@ -392,6 +402,7 @@ Global
392402
{0F0A008E-AB12-40EC-A671-37A541B08C7F} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
393403
{BD7C5776-82F2-40C6-AF01-B3CC1E2D83AF} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
394404
{FA273F69-5762-43D8-AEA1-B4F08090D624} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
405+
{4CC2A90D-D240-4382-B4BF-5E175515E492} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
395406
EndGlobalSection
396407
GlobalSection(ExtensibilityGlobals) = postSolution
397408
SolutionGuid = {A025908B-DAB1-46CB-83A3-56F3B863D8FA}

GVFS/FastFetch/CheckoutFetchHelper.cs renamed to GVFS/FastFetch/CheckoutPrefetcher.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
namespace FastFetch
1414
{
15-
public class CheckoutFetchHelper : PrefetchHelper
15+
public class CheckoutPrefetcher : BlobPrefetcher
1616
{
1717
private readonly bool allowIndexMetadataUpdateFromWorkingTree;
1818
private readonly int checkoutThreadCount;
1919

20-
public CheckoutFetchHelper(
20+
public CheckoutPrefetcher(
2121
ITracer tracer,
2222
Enlistment enlistment,
2323
GitObjectsHttpRequestor objectRequestor,
@@ -64,7 +64,7 @@ public override void Prefetch(string branchOrCommit, bool isBranch)
6464
this.DownloadMissingCommit(commitToFetch, this.GitObjects);
6565

6666
// Configure pipeline
67-
// Checkout uses DiffHelper when running checkout.Start(), which we use instead of LsTreeHelper like in FetchHelper.cs
67+
// Checkout uses DiffHelper when running checkout.Start(), which we use instead of LsTreeHelper
6868
// Checkout diff output => FindMissingBlobs => BatchDownload => IndexPack => Checkout available blobs
6969
CheckoutJob checkout = new CheckoutJob(this.checkoutThreadCount, this.FolderList, commitToFetch, this.Tracer, this.Enlistment);
7070
FindMissingBlobsJob blobFinder = new FindMissingBlobsJob(this.SearchThreadCount, checkout.RequiredBlobs, checkout.AvailableBlobShas, this.Tracer, this.Enlistment);

‎GVFS/FastFetch/FastFetch.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\LibGit2Sharp.NativeBinaries.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -56,15 +56,17 @@
5656
<Compile Include="$(BuildOutputDir)\CommonAssemblyVersion.cs">
5757
<Link>CommonAssemblyVersion.cs</Link>
5858
</Compile>
59-
<Compile Include="CheckoutFetchHelper.cs" />
59+
<Compile Include="CheckoutPrefetcher.cs" />
6060
<Compile Include="FastFetchVerb.cs" />
6161
<Compile Include="..\GVFS.PlatformLoader\PlatformLoader.Windows.cs" />
6262
<Compile Include="Program.cs" />
6363
<Compile Include="Properties\AssemblyInfo.cs" />
6464
</ItemGroup>
6565
<ItemGroup>
6666
<None Include="App.config" />
67-
<None Include="packages.config" />
67+
<None Include="packages.config">
68+
<SubType>Designer</SubType>
69+
</None>
6870
</ItemGroup>
6971
<ItemGroup>
7072
<ProjectReference Include="..\GVFS.Common\GVFS.Common.csproj">
@@ -86,11 +88,11 @@
8688
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
8789
</PropertyGroup>
8890
<Error Condition="!Exists('..\..\..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets'))" />
89-
<Error Condition="!Exists('..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
9091
<Error Condition="!Exists('..\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\LibGit2Sharp.NativeBinaries.props'))" />
92+
<Error Condition="!Exists('..\..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets'))" />
9193
</Target>
9294
<Import Project="..\..\..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets" Condition="Exists('..\..\..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" />
93-
<Import Project="..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
95+
<Import Project="..\..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" />
9496
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9597
Other similar extension points exist, see Microsoft.Common.targets.
9698
<Target Name="BeforeBuild">

‎GVFS/FastFetch/FastFetchVerb.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ private int ExecuteWithExitCode()
218218
});
219219

220220
RetryConfig retryConfig = new RetryConfig(this.MaxAttempts, TimeSpan.FromMinutes(RetryConfig.FetchAndCloneTimeoutMinutes));
221-
PrefetchHelper fetchHelper = this.GetFetchHelper(tracer, enlistment, cacheServer, retryConfig);
221+
BlobPrefetcher prefetcher = this.GetFolderPrefetcher(tracer, enlistment, cacheServer, retryConfig);
222222
string error;
223-
if (!PrefetchHelper.TryLoadFolderList(enlistment, this.FolderList, this.FolderListFile, fetchHelper.FolderList, out error))
223+
if (!BlobPrefetcher.TryLoadFolderList(enlistment, this.FolderList, this.FolderListFile, prefetcher.FolderList, out error))
224224
{
225225
tracer.RelatedError(error);
226226
Console.WriteLine(error);
@@ -237,10 +237,10 @@ private int ExecuteWithExitCode()
237237
try
238238
{
239239
bool isBranch = this.Commit == null;
240-
fetchHelper.Prefetch(commitish, isBranch);
241-
return !fetchHelper.HasFailures;
240+
prefetcher.Prefetch(commitish, isBranch);
241+
return !prefetcher.HasFailures;
242242
}
243-
catch (PrefetchHelper.FetchException e)
243+
catch (BlobPrefetcher.FetchException e)
244244
{
245245
tracer.RelatedError(e.Message);
246246
return false;
@@ -263,7 +263,7 @@ private int ExecuteWithExitCode()
263263
Console.WriteLine("See the full log at " + fastfetchLogFile);
264264
}
265265

266-
isSuccess &= !fetchHelper.HasFailures;
266+
isSuccess &= !prefetcher.HasFailures;
267267
}
268268
catch (AggregateException e)
269269
{
@@ -303,13 +303,13 @@ private string GetRemoteUrl(Enlistment enlistment)
303303
return enlistment.RepoUrl;
304304
}
305305

306-
private PrefetchHelper GetFetchHelper(ITracer tracer, Enlistment enlistment, CacheServerInfo cacheServer, RetryConfig retryConfig)
306+
private BlobPrefetcher GetFolderPrefetcher(ITracer tracer, Enlistment enlistment, CacheServerInfo cacheServer, RetryConfig retryConfig)
307307
{
308308
GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(tracer, enlistment, cacheServer, retryConfig);
309309

310310
if (this.Checkout)
311311
{
312-
return new CheckoutFetchHelper(
312+
return new CheckoutPrefetcher(
313313
tracer,
314314
enlistment,
315315
objectRequestor,
@@ -322,7 +322,7 @@ private PrefetchHelper GetFetchHelper(ITracer tracer, Enlistment enlistment, Cac
322322
}
323323
else
324324
{
325-
return new PrefetchHelper(
325+
return new BlobPrefetcher(
326326
tracer,
327327
enlistment,
328328
objectRequestor,

‎GVFS/FastFetch/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
44
<package id="LibGit2Sharp.NativeBinaries" version="1.0.165" targetFramework="net461" />
55
<package id="StyleCop.Error.MSBuild" version="1.0.0" targetFramework="net461" />
6-
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net461" developmentDependency="true" />
6+
<package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net461" developmentDependency="true" />
77
</packages>

‎GVFS/GVFS.Build/GVFS.PreBuild.csproj‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23-
<RegisterForComInterop>true</RegisterForComInterop>
2423
</PropertyGroup>
2524
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
2625
<DefineConstants>TRACE</DefineConstants>
@@ -40,26 +39,39 @@
4039
<Compile Include="GenerateVersionInfo.cs" />
4140
</ItemGroup>
4241
<ItemGroup>
43-
<None Include="GVFS.props">
42+
<BuildProps Include="GVFS.props">
4443
<SubType>Designer</SubType>
45-
</None>
46-
<None Include="GVFS.cs.props">
44+
</BuildProps>
45+
<BuildProps Include="GVFS.cs.props">
4746
<SubType>Designer</SubType>
48-
</None>
49-
<None Include="GVFS.cpp.props">
47+
</BuildProps>
48+
<BuildProps Include="GVFS.cpp.props">
5049
<SubType>Designer</SubType>
51-
</None>
52-
<None Include="packages.config" />
53-
<None Include="ProjFS.props">
50+
</BuildProps>
51+
<GeneratedPackageConfig Include="packages.config" />
52+
<BuildProps Include="ProjFS.props">
5453
<SubType>Designer</SubType>
55-
</None>
54+
</BuildProps>
5655
</ItemGroup>
5756

5857
<Target Name="GetTargetFrameworkProperties" />
5958
<Target Name="GetNativeManifest" />
6059
<Target Name="GetCopyToOutputDirectoryItems" />
6160
<Target Name="Publish" />
6261

62+
<!-- The following targets are defined here so that we can build
63+
this project without emitting an assembly. -->
64+
<Target Name="BuiltProjectOutputGroup" />
65+
<Target Name="BuiltProjectOutputGroupDependencies" />
66+
<Target Name="DebugSymbolsProjectOutputGroup" />
67+
<Target Name="DebugSymbolsProjectOutputGroupDependencies" />
68+
<Target Name="DocumentationProjectOutputGroup" />
69+
<Target Name="DocumentationProjectOutputGroupDependencies" />
70+
<Target Name="SatelliteDllsProjectOutputGroup" />
71+
<Target Name="SatelliteDllsProjectOutputGroupDependencies" />
72+
<Target Name="SGenFilesOutputGroup" />
73+
<Target Name="SGenFilesOutputGroupDependencies" />
74+
6375
<UsingTask TaskName="GenerateG4WNugetReference" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
6476
<ParameterGroup>
6577
<GitPackageVersion ParameterType="System.String" Required="true" />
@@ -129,7 +141,6 @@
129141

130142
<PropertyGroup>
131143
<GVFSSetupPath>$(BuildOutputDir)\GVFS.Installer\bin\x64\$(Configuration)\SetupGVFS.$(GVFSVersion).exe</GVFSSetupPath>
132-
<GitPackagesConfigPath>$(MSBuildThisFileDirectory)packages.config</GitPackagesConfigPath>
133144
<OutDir>$(BuildOutputDir)\GVFS.Build\</OutDir>
134145
<GitVersionConstantsPath>$(OutDir)GVFSConstants.GitVersion.cs</GitVersionConstantsPath>
135146
<G4WInstallBatPath>$(OutDir)InstallG4W.bat</G4WInstallBatPath>
@@ -160,13 +171,13 @@
160171
</ItemGroup>
161172

162173
<Target Name="GVFSPreBuild"
163-
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateG4WNugetReference.cs"
164-
Outputs="$(GitPackagesConfigPath)">
174+
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateG4WNugetReference.cs;@(BuildProps)"
175+
Outputs="@(GeneratedPackageConfig)">
165176
<GenerateG4WNugetReference GitPackageVersion="$(GitPackageVersion)" Condition="'$(OS)' == 'Windows_NT'" />
166177
</Target>
167178

168179
<Target Name="GVFSPackageRestore"
169-
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(GitPackagesConfigPath)"
180+
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);@(GeneratedPackageConfig)"
170181
Outputs="$(RestoreTimestampPath)"
171182
DependsOnTargets="GVFSPreBuild"
172183
Condition="'$(OS)' == 'Windows_NT'">
@@ -177,7 +188,7 @@
177188

178189
<Target Name="GenerateInstallScripts"
179190
DependsOnTargets="GVFSPackageRestore;$(GenerateInstallScriptsDependsOn)"
180-
Inputs="$(RestoreTimestampPath);$(GitPackagesConfigPath);$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateGitVersionConstants.cs;$(MSBuildThisFileDirectory)GenerateInstallScripts.cs;$(MSBuildThisFileDirectory)GenerateGVFSInstallersNuspec.cs"
191+
Inputs="$(RestoreTimestampPath);@(GeneratedPackageConfig);$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateGitVersionConstants.cs;$(MSBuildThisFileDirectory)GenerateInstallScripts.cs;$(MSBuildThisFileDirectory)GenerateGVFSInstallersNuspec.cs"
181192
Outputs="$(GitVersionConstantsPath);$(G4WInstallBatPath);$(GVFSInstallBatPath);$(GVFSInstallerNuspecPath)"
182193
Condition="'$(OS)' == 'Windows_NT'">
183194
<GenerateGitVersionConstants GitPackageVersion="$(GitPackageVersion)" PackagesPath="$(PackagesDir)" OutputFile="$(GitVersionConstantsPath)">
@@ -189,7 +200,7 @@
189200

190201
<Target Name="GenerateShared"
191202
DependsOnTargets="GenerateInstallScripts;$(GenerateSharedDependsOn)"
192-
Inputs="$(RestoreTimestampPath);$(GitPackagesConfigPath);$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateVersionInfo.cs;$(MSBuildThisFileDirectory)GenerateApplicationManifests.cs"
203+
Inputs="$(RestoreTimestampPath);@(GeneratedPackageConfig);$(MSBuildThisFileFullPath);$(MSBuildProjectFullPath);$(MSBuildThisFileDirectory)GenerateVersionInfo.cs;$(MSBuildThisFileDirectory)GenerateApplicationManifests.cs"
193204
Outputs="$(AssemblyVersionPath);$(VersionHeaderPath);@(ApplicationNeedsManifest->'%(OutputFile)')">
194205
<GenerateVersionInfo Version="$(GVFSVersion)" AssemblyVersion="$(AssemblyVersionPath)" VersionHeader="$(VersionHeaderPath)" />
195206
<GenerateApplicationManifests Version="$(GVFSVersion)" ApplicationName="@(ApplicationNeedsManifest)" ManifestPath="@(ApplicationNeedsManifest->'%(OutputFile)')" />

‎GVFS/GVFS.Build/GVFS.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup Label="Parameters">
55
<GVFSVersion>0.2.173.2</GVFSVersion>
6-
<GitPackageVersion>2.6479675</GitPackageVersion>
6+
<GitPackageVersion>2.20180730.3</GitPackageVersion>
77
</PropertyGroup>
88

99
<PropertyGroup Label="DefaultSettings">

‎GVFS/GVFS.Build/ProjFS.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ProjFSPackage>GVFS.ProjFS.2018.628.1</ProjFSPackage>
4+
<ProjFSPackage>GVFS.ProjFS.2018.719.1</ProjFSPackage>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)