Merge pull request #93 from microsoft/develop

NoelCross · web-flow · commit 9384ef51dd3b · 2023-10-06T14:03:18.000-07:00
Fix build pipeline to produce new package
diff --git a/Pipelines/Templates/Package.yaml b/Pipelines/Templates/Package.yaml
@@ -25,7 +25,7 @@ jobs:
     inputs:
       targetType: 'inline'
       script:
-        $info = (Get-UnitySetupInstance | Select-UnitySetupInstance -Version $(Unity2020LTSVer)).Path + "\Editor";
+        $info = "$env:Unity2020LTS" + "\Editor";
         Write-Output "##vso[task.setvariable variable=unityLocation;]$info"
   - script: python tools\unity_package.py -u "$(unityLocation)" -s $(Pipeline.Workspace) -o "$(Pipeline.Workspace)\unity" -v $(PackageVersion)
     displayName: Building Unity Package
diff --git a/Source/External/googletest b/Source/External/googletest
@@ -1 +1 @@
-Subproject commit b155875f32dc74e293d96c0de2dfcdfa913804e4
+Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -5,7 +5,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "8697709e0308af4cd5b09dc108480804e5447cf0",
+          "commitHash": "f8d7d77c06936315286eb55f8de22cd23c188571",
           "repositoryUrl": "https://github.com/google/googletest.git"
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"component": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"git": {`
`8`		`- "commitHash": "8697709e0308af4cd5b09dc108480804e5447cf0",`
	`8`	`+ "commitHash": "f8d7d77c06936315286eb55f8de22cd23c188571",`
`9`	`9`	`"repositoryUrl": "https://github.com/google/googletest.git"`
`10`	`10`	`}`
`11`	`11`	`}`