ANNIHILATE .NET 8

dotnet · Oct 3, 2023 · 619bea8 · 619bea8
1 parent 507c061
commit 619bea8
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,25 +59,14 @@ jobs:
       if: ${{ steps.dotdotnet.outputs.cache-hit != 'true' }}
       with:
         dotnet-version: 6.0.201
-    - name: Install Workloads for .NET 6
-      if: ${{ steps.dotdotnet.outputs.cache-hit != 'true' }}
-      run: |
-        mv global.json notglobal.json
-        dotnet workload install android ios maccatalyst maui
-        mv notglobal.json global.json
     - name: Setup .NET 7.0
       uses: actions/setup-dotnet@v1
       if: ${{ steps.dotdotnet.outputs.cache-hit != 'true' }}
       with:
         dotnet-version: 7.0.102
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v1
-      if: ${{ steps.dotdotnet.outputs.cache-hit != 'true' }}
-      with:
-        dotnet-version: 8.0.100-rc.1.23463.5
-    - name: Install Workloads for .NET 8
+    - name: Install Workloads
       if: ${{ steps.dotdotnet.outputs.cache-hit != 'true' }}
-      run: dotnet workload install android ios maccatalyst maui wasm-tools-net6
+      run: dotnet workload install android ios maccatalyst maui
     #- name: Test
     #  if: ${{ github.repository != 'dotnet/Silk.NET' || !startsWith(github.ref, 'refs/tags/') }}
     #  # skip Clean, Restore, and Compile as this will build the affect the whole solution.

diff --git a/build/nuke/Silk.NET.NUKE.csproj b/build/nuke/Silk.NET.NUKE.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\..</NukeRootDirectory>

diff --git a/build/utilities/android_probe.proj b/build/utilities/android_probe.proj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>

diff --git a/documentation/proposals/Proposal - Windowing 3.0.md b/documentation/proposals/Proposal - Windowing 3.0.md
@@ -1,4 +1,4 @@
-net8.0-macnet8.0-iosnet8.0-android# Summary
+# Summary
 
 Cross-platform windowing for Silk.NET rebuilt from the ground-up.
 

diff --git a/examples/CSharp/OpenGL Demos/AndroidDemo/AndroidDemo.csproj b/examples/CSharp/OpenGL Demos/AndroidDemo/AndroidDemo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/examples/CSharp/OpenGL Demos/AndroidInputDemo/AndroidInputDemo.csproj b/examples/CSharp/OpenGL Demos/AndroidInputDemo/AndroidInputDemo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>android-arm64;android-x86;android-arm;android-x64</RuntimeIdentifiers>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.1.23463.5",
+    "version": "7.0.102",
     "rollForward": "major"
   }
 }
diff --git a/src/Lab/Experiments/TriangleNET6/TriangleNET6.csproj b/src/Lab/Experiments/TriangleNET6/TriangleNET6.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0-android;net8.0-ios</TargetFrameworks>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>preview</LangVersion>
         <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net6.0'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifiers>
-        <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net8.0-android'">android-arm64;android-x86;android-arm;android-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net6.0-android'">android-arm64;android-x86;android-arm;android-x64</RuntimeIdentifiers>
         <TrimMode>full</TrimMode>
     </PropertyGroup>
 
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <!-- Android -->
-    <ItemGroup Condition="'$(TargetFramework)' != 'net8.0-android'">
+    <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-android'">
         <Compile Remove="\MainActivity.cs" />
     </ItemGroup>
 

diff --git a/src/Maths/Silk.NET.Maths.Tests/Silk.NET.Maths.Tests.csproj b/src/Maths/Silk.NET.Maths.Tests/Silk.NET.Maths.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <LangVersion>9.0</LangVersion>
         <IsPackable>false</IsPackable>
 

diff --git a/src/Vulkan/Silk.NET.Vulkan.Tests/Silk.NET.Vulkan.Tests.csproj b/src/Vulkan/Silk.NET.Vulkan.Tests/Silk.NET.Vulkan.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>