remove download from action and add to csproj

DynamoDS · Jan 31, 2024 · 8dafc00 · 8dafc00
1 parent bd7764f
commit 8dafc00
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,14 +28,6 @@ jobs:
           } else {
             Write-Error "python node dll was not found!"
           }
-      - name: Get DynamoRuntime from s3
-        run: |
-            curl -o DynamoRuntime.zip https://dyn-builds-data.s3-us-west-2.amazonaws.com/DynamoCoreRuntime3.0.2.zip
-            ls
-      - name: Extract DynamoRuntime
-        run: |
-         7z x DynamoRuntime.zip -o${{ github.workspace }}\DSIronPython\IronPythonTests\bin\Release\net8.0\DynamoRuntime
-
       - name: Run test with the dotnet CLI
         run: |
           dotnet test ${{ github.workspace }}\DSIronPython -p:Configuration=Release --filter "TestCategory!=Failure" --logger "trx;LogFileName=results.trx" --results-directory ${{ github.workspace }}\DSIronPython\TestResults

diff --git a/IronPythonTests/IronPythonTests.csproj b/IronPythonTests/IronPythonTests.csproj
@@ -8,8 +8,6 @@
   <ItemGroup>
 	<PackageReference Include="DynamoVisualProgramming.Tests" Version="3.1.0-beta3940"></PackageReference>
 	  <PackageReference Include="IronPython" Version="2.7.12" />
-	  <PackageReference Include="DynamoVisualProgramming.Core" Version="3.1.0-beta3940">
-	  </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DSIronPython\DSIronPython.csproj" />
@@ -19,4 +17,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
+
+	<Target Name="DownloadDynamoAndUnzip" BeforeTargets="Build">
+		<DownloadFile SourceUrl="https://dyn-builds-data.s3-us-west-2.amazonaws.com/DynamoCoreRuntime_3.1.0.3952_20240131T0007.zip" DestinationFolder="$(MSBuildProjectDirectory)" />
+		<Unzip SourceFiles="DynamoCoreRuntime_3.1.0.3952_20240131T0007.zip" DestinationFolder="$(OutputPath)\" OverwriteReadOnlyFiles="true" />
+	</Target>
+</Project>
diff --git a/IronPythonTests/TestServices.dll.config b/IronPythonTests/TestServices.dll.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<appSettings>
-		<add key="DynamoBasePath" value=".\DynamoRuntime"/>
+		<add key="DynamoBasePath" value="."/>
 		<add key="RequestedLibraryVersion2" value=""/>
 	</appSettings>
 </configuration>