Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions deploy/pipelines/p4vfs-cicd-prod-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ stages:
configuration: $(configuration)
additionalBuildArguments: '/Property:P4VFSCodeSignMethod=Attestation'

- stage: CD
jobs:
- template: templates/p4vfs-cd.yml
parameters:
configuration: $(configuration)
additionalBuildArguments: '/Property:P4VFSPublishDeployDir=\\tc\studio\tools\P4VFS\Public'
2 changes: 1 addition & 1 deletion external/P4VFS/P4VFS.Module.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.P4VFS.External
{
public class P4vfsModule : Module
{
private const string P4VFS_SIGNED_VERSION = "1.30.1.0";
private const string P4VFS_SIGNED_VERSION = "1.31.0.0";
private const string P4VFS_SIGNED_ARTIFACTS_URL = "https://github.com/microsoft/p4vfs/releases/download";

public override string Name
Expand Down
4 changes: 4 additions & 0 deletions source/P4VFS.Console/P4VFS.Notes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Microsoft P4VFS Release Notes

Version [1.31.0.0]
* Backing out driver INF package isolation configuration for compatibility with
older versions of Windows.

Version [1.30.1.0]
* Updating to P4API 26.1
* Updating to OpenSSL 3.0.21 as recommended by P4API 26.1
Expand Down
4 changes: 2 additions & 2 deletions source/P4VFS.Driver/Include/DriverVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#pragma once

#define P4VFS_VER_MAJOR 1 // Increment this number almost never
#define P4VFS_VER_MINOR 30 // Increment this number whenever the driver changes
#define P4VFS_VER_BUILD 1 // Increment this number when a major user mode change has been made
#define P4VFS_VER_MINOR 31 // Increment this number whenever the driver changes
#define P4VFS_VER_BUILD 0 // Increment this number when a major user mode change has been made
#define P4VFS_VER_REVISION 0 // Increment this number when we rebuild with any change

#define P4VFS_VER_STRINGIZE_EX(v) L#v
Expand Down
2 changes: 1 addition & 1 deletion source/P4VFS.Driver/P4VFS.Driver.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Configuration>Win10.0.Release</Configuration>
<Platform Condition="'$(Platform)' == ''">x64</Platform>
<RootNamespace>Microsoft::P4VFS::Driver</RootNamespace>
<InfVerif_AdditionalOptions>/msft</InfVerif_AdditionalOptions>
<InfVerif_AdditionalOptions>/msft /sw1323</InfVerif_AdditionalOptions>
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
1 change: 1 addition & 0 deletions source/P4VFS.Driver/Scripts/TestPush.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ robocopy.exe %REPO_FOLDER%\intermediate\builds\P4VFS.Setup %DEPLOY_FOLDER%\inter
robocopy.exe %REPO_FOLDER%\intermediate\builds\P4VFS.Driver %DEPLOY_FOLDER%\intermediate\builds\P4VFS.Driver %ROBOCOPY_COMMON_OPTIONS%
robocopy.exe %REPO_FOLDER%\intermediate\builds\P4VFS.Console %DEPLOY_FOLDER%\intermediate\builds\P4VFS.Console %ROBOCOPY_COMMON_OPTIONS%
robocopy.exe %REPO_FOLDER%\external\P4API %DEPLOY_FOLDER%\external\P4API %ROBOCOPY_COMMON_OPTIONS% /PURGE
robocopy.exe %REPO_FOLDER%\external\P4VFS %DEPLOY_FOLDER%\external\P4VFS %ROBOCOPY_COMMON_OPTIONS% /PURGE

EXIT /B 0
10 changes: 5 additions & 5 deletions source/P4VFS.Driver/p4vfsflt.inf
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ AddReg = P4VFSFLT.AddRegistry
;;

[P4VFSFLT.AddRegistry]
HKR,"Parameters","DebugFlags",0x00010001,0x0
HKR,"Parameters","SupportedFeatures",0x00010001,0x3
HKR,"Parameters\Instances","DefaultInstance",0x00000000,%DefaultInstance%
HKR,"Parameters\Instances\"%Instance1.Name%,"Altitude",0x00000000,%Instance1.Altitude%
HKR,"Parameters\Instances\"%Instance1.Name%,"Flags",0x00010001,%Instance1.Flags%
HKR,,"DebugFlags",0x00010001 ,0x0
HKR,,"SupportedFeatures",0x00010001,0x3
HKR,"Instances","DefaultInstance",0x00000000,%DefaultInstance%
HKR,"Instances\"%Instance1.Name%,"Altitude",0x00000000,%Instance1.Altitude%
HKR,"Instances\"%Instance1.Name%,"Flags",0x00010001,%Instance1.Flags%

;;
;; Copy Files Section
Expand Down
Loading