diff --git a/deploy/pipelines/p4vfs-cicd-prod-public.yml b/deploy/pipelines/p4vfs-cicd-prod-public.yml index 39a9caf..50bea99 100644 --- a/deploy/pipelines/p4vfs-cicd-prod-public.yml +++ b/deploy/pipelines/p4vfs-cicd-prod-public.yml @@ -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' \ No newline at end of file diff --git a/external/P4VFS/P4VFS.Module.cs b/external/P4VFS/P4VFS.Module.cs index 3ffd574..e8a0cdc 100644 --- a/external/P4VFS/P4VFS.Module.cs +++ b/external/P4VFS/P4VFS.Module.cs @@ -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 diff --git a/source/P4VFS.Console/P4VFS.Notes.txt b/source/P4VFS.Console/P4VFS.Notes.txt index 88cbe0b..297fbf7 100644 --- a/source/P4VFS.Console/P4VFS.Notes.txt +++ b/source/P4VFS.Console/P4VFS.Notes.txt @@ -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 diff --git a/source/P4VFS.Driver/Include/DriverVersion.h b/source/P4VFS.Driver/Include/DriverVersion.h index 797e0d6..16e5445 100644 --- a/source/P4VFS.Driver/Include/DriverVersion.h +++ b/source/P4VFS.Driver/Include/DriverVersion.h @@ -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 diff --git a/source/P4VFS.Driver/P4VFS.Driver.vcxproj b/source/P4VFS.Driver/P4VFS.Driver.vcxproj index afca440..81891ef 100644 --- a/source/P4VFS.Driver/P4VFS.Driver.vcxproj +++ b/source/P4VFS.Driver/P4VFS.Driver.vcxproj @@ -18,7 +18,7 @@ Win10.0.Release x64 Microsoft::P4VFS::Driver - /msft + /msft /sw1323 10.0.26100.0 diff --git a/source/P4VFS.Driver/Scripts/TestPush.bat b/source/P4VFS.Driver/Scripts/TestPush.bat index ac86251..a338249 100644 --- a/source/P4VFS.Driver/Scripts/TestPush.bat +++ b/source/P4VFS.Driver/Scripts/TestPush.bat @@ -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 diff --git a/source/P4VFS.Driver/p4vfsflt.inf b/source/P4VFS.Driver/p4vfsflt.inf index a58703e..c994fc8 100644 --- a/source/P4VFS.Driver/p4vfsflt.inf +++ b/source/P4VFS.Driver/p4vfsflt.inf @@ -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