fix paths

realm · May 15, 2024 · 92ead96 · 92ead96
1 parent 893b8a3
commit 92ead96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/pkl-workflows/helpers/Steps.pkl b/.github/pkl-workflows/helpers/Steps.pkl
@@ -78,7 +78,7 @@ const function msbuild(project: String, properties: Mapping<String, String>): Li
 const function dotnetPublish(project: String, framework: Common.NetFramework, runtime: Common.NetRuntime, properties: Mapping<String, String>): Listing<gha.Step> = new Listing {
   new gha.Step {
     name = "Publish \(project)"
-    run = "dotnet publish \(project) -c \(Common.configuration) -f \(framework) -r \(runtime) -restore \(propertiesToString(properties)) --no-self-contained"
+    run = "dotnet publish \(project) -c \(Common.configuration) -f \(framework) -r \(runtime) \(propertiesToString(properties)) --no-self-contained"
   }
   new gha.Step {
     name = "Output executable path"

diff --git a/.github/pkl-workflows/helpers/Test.pkl b/.github/pkl-workflows/helpers/Test.pkl
@@ -29,7 +29,7 @@ function netFramework(_packageJob: String, syncDifferentiators: Listing<String>)
     })
     new gha.Step {
       name = "Run the tests"
-      run = "./Tests/Realm/Tests/bin/\(Common.configuration)/net461/Realm.Tests.exe --result=\(outputFile) --labels=After \(baasTestArgs(testConfig))"
+      run = "./Tests/Realm.Tests/bin/\(Common.configuration)/net461/Realm.Tests.exe --result=\(outputFile) --labels=After \(baasTestArgs(testConfig))"
     }
     ...reportTestResults(testConfig)
   }

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -105,7 +105,7 @@ jobs:
     - name: Build Tests/Realm.Tests
       run: msbuild Tests/Realm.Tests -p:Configuration=Release -restore -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} -p:RealmTestsStandaloneExe=true -p:TargetFramework=net461
     - name: Run the tests
-      run: './Tests/Realm/Tests/bin/Release/net461/Realm.Tests.exe --result=TestResults.xml --labels=After '
+      run: './Tests/Realm.Tests/bin/Release/net461/Realm.Tests.exe --result=TestResults.xml --labels=After '
     - name: Publish Unit Test Results
       if: always()
       uses: LaPeste/test-reporter@510caf50a955b1003bec48a6494be4d6537f3a0b
@@ -165,7 +165,7 @@ jobs:
       with:
         dotnet-version: ${{ steps.get-net-version.outputs.version }}
     - name: Publish Tests/Realm.Tests
-      run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.framework }} -r ${{ matrix.os.runtime }} -restore -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} -p:RealmTestsStandaloneExe=true --no-self-contained
+      run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.framework }} -r ${{ matrix.os.runtime }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} -p:RealmTestsStandaloneExe=true --no-self-contained
     - name: Output executable path
       id: dotnet-publish
       run: echo 'executable-path=./Tests/Realm.Tests/bin/Release/${{ matrix.framework }}/${{ matrix.os.runtime }}' >> $GITHUB_OUTPUT
@@ -273,7 +273,7 @@ jobs:
     - name: Setup workloads
       run: dotnet workload install android ${{ (matrix.os.runner != 'ubuntu-latest' && 'tvos ios maccatalyst') || '' }}
     - name: Publish Tests/Weaver/Realm.Fody.Tests
-      run: dotnet publish Tests/Weaver/Realm.Fody.Tests -c Release -f net6.0 -r ${{ matrix.os.runtime }} -restore  --no-self-contained
+      run: dotnet publish Tests/Weaver/Realm.Fody.Tests -c Release -f net6.0 -r ${{ matrix.os.runtime }}  --no-self-contained
     - name: Output executable path
       id: dotnet-publish
       run: echo 'executable-path=./Tests/Weaver/Realm.Fody.Tests/bin/Release/net6.0/${{ matrix.os.runtime }}' >> $GITHUB_OUTPUT