Merge pull request #1755 from ldennington/update-metadata

Set up infrastructure for `wingetcreate`
microsoft · Oct 13, 2021 · 8748fc2 · 8748fc2
2 parents b05cf32 + 68d7d38
commit 8748fc2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/release-winget.yaml b/.github/workflows/release-winget.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
     - id: update-winget
       name: Update winget repository

diff --git a/GVFS/GVFS.Installers/GVFS.Installers.csproj b/GVFS/GVFS.Installers/GVFS.Installers.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <Target Name="CreateInstaller" BeforeTargets="Build;SignFiles">
-    <Exec Command="$(PkgTools_InnoSetup)\tools\ISCC.exe /DLayoutDir=$(LayoutPath) /DGVFSVersion=$(GVFSVersion) Setup.iss /O$(OutputPath)" />
+    <Exec Command='"$(PkgTools_InnoSetup)\tools\ISCC.exe" /DLayoutDir="$(LayoutPath)" /DGVFSVersion=$(GVFSVersion) Setup.iss /O"$(OutputPath)"' />
   </Target>
 
   <Target Name="CreateNuspecFile" AfterTargets="CreateInstaller">

diff --git a/GVFS/GVFS.Installers/Setup.iss b/GVFS/GVFS.Installers/Setup.iss
@@ -3,9 +3,9 @@
 
 ; General documentation on how to use InnoSetup scripts: http://www.jrsoftware.org/ishelp/index.php
 
-#define MyAppName "GVFS"
+#define MyAppName "VFS for Git"
 #define MyAppInstallerVersion GetFileVersion(LayoutDir + "\GVFS.exe")
-#define MyAppPublisher "Microsoft Corporation"
+#define MyAppPublisher "Microsoft"
 #define MyAppPublisherURL "http://www.microsoft.com"
 #define MyAppURL "https://github.com/microsoft/VFSForGit"
 #define MyAppExeName "GVFS.exe"

diff --git a/GVFS/GVFS.Payload/GVFS.Payload.csproj b/GVFS/GVFS.Payload/GVFS.Payload.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <Target Name="CreatePayload" AfterTargets="CoreBuild" BeforeTargets="SignFiles">
-    <Exec Command="$(MSBuildThisFileDirectory)layout.bat $(Configuration) $(GVFSVersion) $(PkgGVFS_ProjFS) $(PkgGVFS_VCRuntime) $(OutputPath)" />
+    <Exec Command='"$(MSBuildThisFileDirectory)layout.bat" $(Configuration) $(GVFSVersion) "$(PkgGVFS_ProjFS)" "$(PkgGVFS_VCRuntime)" "$(OutputPath)"' />
   </Target>
 
   <Target Name="CleanPayload" BeforeTargets="AfterClean">

diff --git a/GVFS/GVFS.Payload/layout.bat b/GVFS/GVFS.Payload/layout.bat
@@ -38,7 +38,7 @@ SET VCRUNTIME=%4
 SET OUTPUT=%5
 
 SET ROOT=%~dp0..\..
-SET BUILD_OUT=%ROOT%\..\out
+SET BUILD_OUT="%ROOT%\..\out"
 SET MANAGED_OUT_FRAGMENT=bin\%CONFIGURATION%\net461\win-x64
 SET NATIVE_OUT_FRAGMENT=bin\x64\%CONFIGURATION%
 

diff --git a/scripts/Build.bat b/scripts/Build.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
-CALL %~dp0\InitializeEnvironment.bat || EXIT /b 10
+CALL "%~dp0\InitializeEnvironment.bat" || EXIT /b 10
 SETLOCAL
 SETLOCAL EnableDelayedExpansion
 
@@ -44,7 +44,7 @@ IF NOT EXIST "%NUGET_EXEC%" (
 REM Acquire vswhere to find VS installations reliably
 SET VSWHERE_VER=2.6.7
 "%NUGET_EXEC%" install vswhere -Version %VSWHERE_VER% || exit /b 1
-SET VSWHERE_EXEC=%VFS_PACKAGESDIR%\vswhere.%VSWHERE_VER%\tools\vswhere.exe
+SET VSWHERE_EXEC="%VFS_PACKAGESDIR%\vswhere.%VSWHERE_VER%\tools\vswhere.exe"
 
 REM Assumes default installation location for Windows 10 SDKs
 IF NOT EXIST "C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0" (
@@ -69,15 +69,15 @@ IF NOT DEFINED MSBUILD_EXEC (
 ECHO ^**********************
 ECHO ^* Restoring Packages *
 ECHO ^**********************
-"%MSBUILD_EXEC%" %VFS_SRCDIR%\GVFS.sln ^
+"%MSBUILD_EXEC%" "%VFS_SRCDIR%\GVFS.sln" ^
         /t:Restore ^
         /v:%VERBOSITY% ^
         /p:Configuration=%CONFIGURATION% || GOTO ERROR
 
 ECHO ^*********************
 ECHO ^* Building Solution *
 ECHO ^*********************
-"%MSBUILD_EXEC%" %VFS_SRCDIR%\GVFS.sln ^
+"%MSBUILD_EXEC%" "%VFS_SRCDIR%\GVFS.sln" ^
         /t:Build ^
         /v:%VERBOSITY% ^
         /p:Configuration=%CONFIGURATION% || GOTO ERROR