Skip to content

Commit baa121d

Browse files
lilithlilith
committed
Fix references in TestDotNetFull.csproj
1 parent 2f21b6a commit baa121d

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

‎.github/workflows/dotnet-core.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636

3737
- os: windows-11-arm
3838
test_aot: false
39-
test_legacy: true
4039
rid: win-arm64
4140

4241
- os: macos-14
@@ -155,7 +154,7 @@ jobs:
155154
if: matrix.test_legacy
156155
run: |
157156
dotnet restore ${{ env.FULL_SLN }}
158-
nuget restore ${{ env.FULL_SLN }}
157+
nuget restore ${{ env.FULL_SLN }} -SolutionDirectory src
159158
msbuild ${{ env.FULL_SLN }} /p:Configuration=Release /p:Platform="Any CPU"
160159
161160
- name: Legacy - Test Imageflow.TestDotNetFull and Imageflow.TestDotNetFullPackageReference

‎global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
6+
}
7+
}

‎test_legacy_dotnet.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Write-Host "Step 0: Cleaning up previous builds and caches..."
4848
try {
4949
dotnet clean $solutionFile --configuration Release
5050
dotnet nuget locals all --clear
51+
# delete src/packages
52+
Remove-Item -Recurse -Force src/packages
5153
Write-Host "Cleanup successful."
5254
} catch {
5355
Write-Warning "Cleanup step failed. This might not affect the build, but it's not a clean run. $_"
@@ -68,7 +70,7 @@ try {
6870
Write-Host "Step 2: Restoring NuGet packages for the solution (nuget.exe)..."
6971
try {
7072
# This is required for legacy projects that use packages.config
71-
nuget restore $solutionFile
73+
nuget restore $solutionFile -SolutionDirectory src
7274
Write-Host "NuGet restore for legacy project completed successfully."
7375
} catch {
7476
Write-Error "NuGet restore failed. $_"

‎tests/Imageflow.TestDotNetFull/Imageflow.TestDotNetFull.csproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" />
44
<PropertyGroup>
@@ -72,14 +72,10 @@
7272
</PropertyGroup>
7373
<Error Condition="!Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props'))" />
7474
<Error Condition="!Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets'))" />
75-
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86.targets'))" />
76-
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86_64.targets'))" />
77-
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86.targets'))" />
78-
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86_64.targets'))" />
75+
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86.targets'))" />
76+
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86_64.targets'))" />
7977
</Target>
8078
<Import Project="..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" />
81-
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86.targets')" />
82-
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" />
83-
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86.targets')" />
84-
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview8\build\net45\Imageflow.NativeTool.win-x86_64.targets')" />
85-
</Project>
79+
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86.targets')" />
80+
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.1.1-rc10\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" />
81+
</Project>

‎tests/Imageflow.TestDotNetFull/packages.config

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<!-- <package id="Imageflow.NativeRuntime.win-x86" version="2.1.1-rc10" targetFramework="net462" /> -->
4-
<!-- <package id="Imageflow.NativeRuntime.win-x86_64" version="2.1.1-rc10" targetFramework="net462" /> -->
5-
<!-- -->
6-
<!-- -->
7-
<package id="Imageflow.NativeRuntime.All" version="2.1.1-rc10" targetFramework="net462"/>
8-
<package id="Imageflow.NativeTool.win-x86" version="2.1.1-rc10" targetFramework="net462"/>
9-
<package id="Imageflow.NativeTool.win-x86_64" version="2.1.1-rc10" targetFramework="net462"/>
3+
<package id="Imageflow.NativeRuntime.win-x86" version="2.1.1-rc10" targetFramework="net462"/>
4+
<package id="Imageflow.NativeRuntime.win-x86_64" version="2.1.1-rc10" targetFramework="net462"/>
105
<package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net462" />
116
<package id="MSTest.TestFramework" version="2.1.1" targetFramework="net462" />
127
</packages>

0 commit comments

Comments
 (0)