Use VS SDK to create syso file from Manifest

.github/workflows/ci.yml

@@ -4,8 +4,8 @@ on:
   - pull_request
 
 env:
-  GO_BUILD_CMD: 'go build "-ldflags=-s -w" -trimpath'
-  GO_BUILD_TEST_CMD: "go test -mod=mod -gcflags=all=-d=checkptr -c -tags functional"
+  GO_BUILD_CMD: 'go build "-ldflags=-s -w -linkmode=external" -trimpath'
+  GO_BUILD_TEST_CMD: 'go test -mod=mod "-ldflags=-linkmode=external" -gcflags=all=-d=checkptr -c -tags functional'
 
   GOTESTSUM_VERSION: "latest"
 
@@ -319,21 +319,28 @@ jobs:
           # accept the eula
           & '${{ github.workspace }}/bin/psexec' -accepteula -nobanner cmd /c "exit 0"
 
+      - name: Generate Resource Object Files
+        shell: pwsh
+        run: |
+          go generate -x ./cmd/...
+          cd test
+          go generate -x ./...
+
       # run tests
       - name: Test rego security policy
-        run: ${{ env.GOTESTSUM_CMD }} -tags=rego -timeout=30m -gcflags=all=-d=checkptr ./pkg/securitypolicy/...
+        run: ${{ env.GOTESTSUM_CMD }} -ldflags=-linkmode=external -gcflags=all=-d=checkptr -tags=rego -timeout=30m ./pkg/securitypolicy/...
 
       - name: Test repo
-        run: ${{ env.GOTESTSUM_CMD }} -gcflags=all=-d=checkptr -tags admin -timeout=20m ./...
+        run: ${{ env.GOTESTSUM_CMD }} -ldflags=-linkmode=external -gcflags=all=-d=checkptr -tags=admin -timeout=20m ./...
 
       - name: Test lcow tagged packages (shimV2)
-        run: ${{ env.GOTESTSUM_CMD }} -gcflags=all=-d=checkptr -tags lcow -timeout=10m ./...
+        run: ${{ env.GOTESTSUM_CMD }} -ldflags=-linkmode=external -gcflags=all=-d=checkptr -tags=lcow -timeout=10m ./...
 
       - name: Test wcow tagged packages (shimV2)
-        run: ${{ env.GOTESTSUM_CMD }} -gcflags=all=-d=checkptr -tags wcow -timeout=10m ./...
+        run: ${{ env.GOTESTSUM_CMD }} -ldflags=-linkmode=external -gcflags=all=-d=checkptr -tags=wcow -timeout=10m ./...
 
       - name: Run non-functional tests
-        run: ${{ env.GOTESTSUM_CMD }} -mod=mod -gcflags=all=-d=checkptr ./internal/... ./pkg/... ./parity/...
+        run: ${{ env.GOTESTSUM_CMD }} -ldflags=-linkmode=external -gcflags=all=-d=checkptr -mod=mod -timeout=10m ./internal/... ./pkg/... ./parity/...
         working-directory: test
 
       - name: Build and run containerd-shim-runhcs-v1 tests
@@ -537,8 +544,10 @@ jobs:
 
       - name: Build the shim
         working-directory: src/github.com/Microsoft/hcsshim
-        shell: powershell
+        shell: pwsh
         run: |
+          go generate -x ./cmd/containerd-shim-runhcs-v1
+
           ${{ env.GO_BUILD_CMD }} -mod vendor -o "${{ github.workspace }}/src/github.com/containerd/containerd/bin/containerd-shim-runhcs-v1.exe" .\cmd\containerd-shim-runhcs-v1
 
       - name: Install gotestsum
@@ -655,6 +664,13 @@ jobs:
             $LASTEXITCODE = 0
           }
 
+      - name: Generate Resource Object Files
+        shell: pwsh
+        run: |
+          go generate -x ./cmd/...
+          cd test
+          go generate -x ./...
+
       - run: ${{ env.GO_BUILD_CMD }} -tags lcow ./...
         name: Build lcow tagged packages (shimV2)
       - run: ${{ env.GO_BUILD_CMD }} -tags wcow ./...
@@ -693,7 +709,7 @@ jobs:
         name: Build rootfs.exe
       - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/securitypolicy
         name: Build securitypolicy.exe
-      - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/securitypolicy
+      - run: go build "-ldflags=-s -w" -trimpath ./internal/tools/securitypolicy
         name: Build securitypolicy
         env:
           GOOS: linux

.gitignore

@@ -4,6 +4,11 @@
 *.so
 *.dylib
 
+# manifest related generated files
+*.syso
+manifest.xml
+*.exe.manifest
+
 # Ignore vscode setting files
 .vscode/
 .idea/

cmd/containerd-shim-lcow-v2/main.go

@@ -23,7 +23,7 @@ import (
 )
 
 // Add a manifest to get proper Windows version detection.
-//go:generate go tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -platform-specific
+//go:generate pwsh -Command "../../scripts/New-ResourceObjectFile.ps1 -ErrorAction 'Stop' -Destination '.' -Name 'containerd-shim-lcow-v2' -UseVersionFile -Architecture 'all'"
 
 func main() {
 	logrus.AddHook(log.NewHook())

cmd/containerd-shim-runhcs-v1/main.go

@@ -31,7 +31,7 @@ const usage = ``
 const ttrpcAddressEnv = "TTRPC_ADDRESS"
 
 // Add a manifest to get proper Windows version detection.
-//go:generate go tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -platform-specific
+//go:generate pwsh -Command "../../scripts/New-ResourceObjectFile.ps1 -ErrorAction 'Stop' -Destination '.' -Name 'containerd-shim-runhcs-v1' -UseVersionFile -Architecture 'all'"
 
 // `-ldflags '-X ...'` only works if the variable is uninitialized or set to a constant value.
 // keep empty and override with data from [internal/version] only if empty to allow

cmd/ncproxy/main.go

@@ -8,6 +8,8 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+//go:generate pwsh -Command "../../scripts/New-ResourceObjectFile.ps1 -ErrorAction 'Stop' -Destination '.' -Name 'ncproxy' -UseVersionFile -Architecture 'all'"
+
 func main() {
 	if err := app().Run(os.Args); err != nil {
 		logrus.Fatal(err)

cmd/runhcs/main.go

@@ -20,7 +20,7 @@ import (
 )
 
 // Add a manifest to get proper Windows version detection.
-//go:generate go tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -platform-specific
+//go:generate pwsh -Command "../../scripts/New-ResourceObjectFile.ps1 -ErrorAction 'Stop' -Destination '.' -Name 'runhcs' -UseVersionFile -Architecture 'all'"
 
 // `-ldflags '-X ...'` only works if the variable is uninitialized or set to a constant value.
 // keep empty and override with data from [internal/version] only if empty to allow