Skip to content

Commit

Permalink
All github action yml files use windows-latest
Browse files Browse the repository at this point in the history
- Reverted to using dotnet pack with a slnf file
- Removed hardcoded references to Microsft.Webapplication.targets in Spark.JsTests.csproj
  • Loading branch information
bounav committed Jan 1, 2025
1 parent 4ad94c6 commit 145766f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
build:

runs-on: windows-2019
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ jobs:
- name: Pack
run: |
cd src
dotnet pack Spark/Spark.csproj --include-symbols --output nupkgs --no-build
dotnet pack Spark.Web/Spark.Web.csproj --include-symbols --output nupkgs --no-build
dotnet pack Spark.Web.Mvc/Spark.Web.Mvc.csproj --include-symbols --output nupkgs --no-build
dotnet pack Spark.AspNetCore.Mvc/Spark.AspNetCore.MVc.csproj --include-symbols --output nupkgs --no-build
dotnet pack spark-pack.slnf --include-symbols --output nupkgs --no-build
- name: Push to NuGet
run: |
cd src/nupkgs
Expand Down
8 changes: 0 additions & 8 deletions src/Spark.JsTests/Spark.JsTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,4 @@
<Reference Include="System.Web" />
<Reference Include="System.Web.Services" />
</ItemGroup>

<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<!-- order is important! -->
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" />
</Project>

0 comments on commit 145766f

Please sign in to comment.