Merge pull request #9 from opentk/develop

Update to static-ucrt builds for windows builds
opentk · Jul 13, 2023 · 4d69eda · 4d69eda
2 parents 0baf3d6 + 12952eb
commit 4d69eda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,15 +23,15 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install xorg-dev
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Download dependencies and create Nuget Package
       run: ./make_nuget.ps1 "" ${{ github.run_number }}
       shell: pwsh
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: NugetPackage
         path: ./artifacts/*.nupkg

diff --git a/glfw-redist.csproj b/glfw-redist.csproj
@@ -18,12 +18,12 @@
     <PackageIcon>opentk.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN64/lib-vc2019/*.dll">
+    <Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN64/lib-static-ucrt/*.dll">
       <PackagePath>runtimes/win-x64/native/</PackagePath>
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN32/lib-vc2019/*.dll">
+    <Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN32/lib-static-ucrt/*.dll">
       <PackagePath>runtimes/win-x86/native/</PackagePath>
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/make_nuget.ps1 b/make_nuget.ps1
@@ -7,11 +7,7 @@ $ErrorActionPreference = "Stop"
 [String]$GLFW_SHORT_VERSION = $GLFW_VERSION.Substring(0, $GLFW_VERSION.LastIndexOf("."))
 
 $buildVersionResult = $verBuild.ToString()
-$currentBranch=(git log -n 1 --pretty=%D HEAD)
-$splt = [regex]::split($currentBranch, "(\s*,\s+)|(\s+->\s+)")
-$currentBranch=$splt[2]
-$splt = $currentBranch -split "/"
-$currentBranch = $splt[$splt.Length - 1]
+$currentBranch=(git branch --show-current)
 Write-Output "Current Branch: $currentBranch"
 
 if($currentBranch -eq "develop") {