Skip to content

Commit 033d62d

Browse files
PerkseyPerksey
committed
Fix build
1 parent 255ede5 commit 033d62d

File tree

10 files changed

+18
-98
lines changed

10 files changed

+18
-98
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@ on:
44
branches:
55
- 'main'
66
- 'release/*'
7-
paths-ignore:
8-
- 'documentation/**'
97
pull_request:
10-
# all branches
11-
paths-ignore:
12-
- 'documentation/**'
8+
# none
139
jobs:
1410
Build:
1511
runs-on: windows-latest
1612
steps:
1713
- uses: actions/checkout@v2
1814
with:
1915
submodules: 'true'
20-
- name: Setup Java JDK 11
21-
uses: actions/[email protected]
22-
with:
23-
java-version: 11
24-
distribution: "temurin"
25-
- name: Setup .NET 6.0
26-
uses: actions/setup-dotnet@v1
27-
with:
28-
dotnet-version: 6.0.100
2916
- name: Setup .NET 5.0
3017
uses: actions/setup-dotnet@v1
3118
with:
@@ -36,9 +23,6 @@ jobs:
3623
dotnet-version: 3.1.404
3724
- name: Setup NUKE
3825
run: dotnet tool install Nuke.GlobalTool --global
39-
- name: Install Workloads
40-
# TODO: This is slow. Maybe we can make a docker container with this already done?
41-
run: dotnet workload install android android-aot ios maccatalyst maui
4226
- name: Test
4327
# skip Clean, Restore, and Compile as this will build the affect the whole solution.
4428
# dotnet test will compile the necessary projects for testing only.
@@ -47,7 +31,7 @@ jobs:
4731
run: nuke ValidateSolution
4832
- name: Pack
4933
# TODO build native mixins such as BuildLibSilkDroid
50-
run: nuke Pack --configuration Release --msbuild-properties VersionSuffix=build${{ github.run_number }}.0 ContinuousIntegrationBuild=true --feature-sets Legacy-Android Legacy-iOS
34+
run: nuke Pack --configuration Release --msbuild-properties VersionSuffix=build${{ github.run_number }}.0 ContinuousIntegrationBuild=true --feature-sets Android iOS
5135
- name: Push to NuGet
5236
if: ${{ github.repository == 'dotnet/Silk.NET' && github.event_name != 'pull_request' }}
5337
run: nuke PushToNuGet --skip Clean Restore Compile Pack --nuget-feed https://pkgs.dev.azure.com/UltzOS/Silk.NET/_packaging/Experimental/nuget/v3/index.json --nuget-username ${{ secrets.AZDO_ARTIFACTS_USERNAME }} --nuget-password ${{ secrets.AZDO_ARTIFACTS_TOKEN }} --nuget-api-key az

‎.github/workflows/deploy.yml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,11 @@ jobs:
1212
- uses: actions/checkout@v2
1313
with:
1414
submodules: 'true'
15-
- name: Setup Java JDK 11
16-
uses: actions/[email protected]
17-
with:
18-
java-version: 11
19-
distribution: "temurin"
20-
- name: Setup .NET 6.0
21-
uses: actions/setup-dotnet@v1
22-
with:
23-
dotnet-version: 6.0.100
24-
- name: Setup .NET 5.0
15+
- name: Setup .NET Core
2516
uses: actions/setup-dotnet@v1
2617
with:
2718
dotnet-version: 5.0.201
28-
- name: Setup .NET Core 3.1
29-
uses: actions/setup-dotnet@v1
30-
with:
31-
dotnet-version: 3.1.404
3219
- name: Setup NUKE
3320
run: dotnet tool install Nuke.GlobalTool --global
34-
- name: Install Workloads
35-
# TODO: This is slow. Maybe we can make a docker container with this already done?
36-
run: dotnet workload install android android-aot ios maccatalyst maui
37-
- name: Pack
38-
run: nuke Pack --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Legacy-Android Legacy-iOS
39-
- name: Upload Unsigned Artifacts to Actions
40-
uses: actions/[email protected]
41-
with:
42-
name: unsigned_nupkgs
43-
path: "build/output_packages/*.nupkg"
44-
if-no-files-found: warn
45-
retention-days: 1
4621
- name: Push to NuGet
47-
run: nuke SignPackages PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}"
48-
- name: Upload Signed Artifacts to Actions
49-
uses: actions/[email protected]
50-
with:
51-
name: signed_nupkgs
52-
path: "build/output_packages/*.nupkg"
53-
if-no-files-found: warn
22+
run: nuke PushToNuGet --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }}

‎CODEOWNERS

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
# Everything
2-
* @dotnet/silk-dotnet
2+
* @Perksey
33

44
# Maths
5-
/src/Maths/ @HurricanKai
5+
/src/Maths/ @HurricanKai
66

77
# SilkTouch
8-
/src/Core/Silk.NET.SilkTouch @HurricanKai
9-
10-
# Core
11-
/src/Core/Silk.NET.Core @Perksey
12-
/src/Core/Silk.NET.Core.Win32Extras @Perksey
13-
14-
# Input
15-
/src/Input/**/*.cs @ThomasMiz
16-
17-
# Vulkan
18-
/src/Vulkan/**/*.cs @HurricanKai
19-
20-
# OpenGL
21-
/src/OpenGL/**/*.cs @ThomasMiz
22-
23-
# BuildTools
24-
/src/Core/Silk.NET.BuildTools @Perksey
25-
/**/*.gen.cs @Perksey
8+
/src/Core/Silk.NET.SilkTouch @HurricanKai

‎Silk.NET.sln.DotSettings

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
1212
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentSubtags/@EntryValue">DoNotTouch</s:String>
1313
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentTagContent/@EntryValue">DoNotTouch</s:String>
14+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Licensed to the .NET Foundation under one or more agreements.&#xD;
15+
The .NET Foundation licenses this file to you under the MIT license.&#xD;
16+
</s:String>
1417
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
1518
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CL/@EntryIndexedValue">CL</s:String>
1619
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EGL/@EntryIndexedValue">EGL</s:String>
@@ -57,7 +60,6 @@
5760
<s:Boolean x:Key="/Default/UserDictionary/Words/=trimmable/@EntryIndexedValue">True</s:Boolean>
5861
<s:Boolean x:Key="/Default/UserDictionary/Words/=typemap/@EntryIndexedValue">True</s:Boolean>
5962
<s:Boolean x:Key="/Default/UserDictionary/Words/=typemaps/@EntryIndexedValue">True</s:Boolean>
60-
<s:Boolean x:Key="/Default/UserDictionary/Words/=typeparam/@EntryIndexedValue">True</s:Boolean>
6163
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ultz/@EntryIndexedValue">True</s:Boolean>
6264
<s:Boolean x:Key="/Default/UserDictionary/Words/=vsync/@EntryIndexedValue">True</s:Boolean>
6365
<s:Boolean x:Key="/Default/UserDictionary/Words/=Vulkan/@EntryIndexedValue">True</s:Boolean>

‎build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
1313
# CONFIGURATION
1414
###########################################################################
1515

16-
$BuildProjectFile = "$PSScriptRoot\build\nuke\Silk.NET.NUKE.csproj"
16+
$BuildProjectFile = "$PSScriptRoot\src\infrastructure\Silk.NET.NUKE\Silk.NET.NUKE.csproj"
1717
$TempDirectory = "$PSScriptRoot\\.tmp"
1818

1919
$DotNetGlobalFile = "$PSScriptRoot\\global.json"
2020
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
21-
$DotNetChannel = "Current"
21+
$DotNetChannel = "Preview"
2222

2323
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
2424
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1

‎build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
99
# CONFIGURATION
1010
###########################################################################
1111

12-
BUILD_PROJECT_FILE="$SCRIPT_DIR/build/nuke/Silk.NET.NUKE.csproj"
12+
BUILD_PROJECT_FILE="$SCRIPT_DIR/src/infrastructure/Silk.NET.NUKE/Silk.NET.NUKE.csproj"
1313
TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
1414

1515
DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
1616
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
17-
DOTNET_CHANNEL="Current"
17+
DOTNET_CHANNEL="Preview"
1818

1919
export DOTNET_CLI_TELEMETRY_OPTOUT=1
2020
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "6.0.100-preview.6.21355.2",
44
"rollForward": "major"
55
}
66
}

‎src/Directory.Build.props

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<Project>
33
<!-- General -->
44
<PropertyGroup>
5-
<!-- Target Framework - kept in sync with .NET LTS releases -->
5+
<!-- Target Framework - kept in sync with .NET LTS releases. Use this property in all csprojs. -->
66
<SilkTargetFramework>net6.0</SilkTargetFramework>
7-
<!-- Set the TFM -->
8-
<TargetFrameworks Condition="'$(TargetFramework)' == '' And '$(TargetFrameworks)' == ''">$(SilkTargetFramework)</TargetFrameworks>
9-
<!-- If TargetFrameworks is SilkTargetFramework, set TargetFramework as well to stop "multiple TFM" errors -->
10-
<TargetFramework Condition="'$(TargetFrameworks)' == '$(SilkTargetFramework)'">$(SilkTargetFramework)</TargetFramework>
117
<!-- Helper properties for accessing directories -->
128
<SilkBenchmarksDir>$(MSBuildThisFileDirectory)benchmarks</SilkBenchmarksDir>
139
<SilkBindingsDir>$(MSBuildThisFileDirectory)bindings</SilkBindingsDir>
@@ -16,7 +12,7 @@
1612
<SilkInfrastructureDir>$(MSBuildThisFileDirectory)infrastructure</SilkInfrastructureDir>
1713
<SilkLibrariesDir>$(MSBuildThisFileDirectory)libraries</SilkLibrariesDir>
1814
<SilkDocumentationDir>$(MSBuildThisFileDirectory)../documentation</SilkDocumentationDir>
19-
<SilkTestsDir>$(MSBuildThisFileDirectory)../documentation</SilkTestsDir>
15+
<SilkTestsDir>$(MSBuildThisFileDirectory)../tests</SilkTestsDir>
2016
</PropertyGroup>
2117
<!-- Compiler Options -->
2218
<PropertyGroup>

‎src/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project InitialTargets="PostImportDefinitions">
22
<!-- NuGet Stuff -->
33
<ItemGroup>
4-
<Content Include="$(MSBuildThisFileDirectory)..\documentation\branding\logo.png"
4+
<Content Include="$(MSBuildThisFileDirectory)..\documentation\readme\silkdotnet_v3.png"
55
Link="logo.png"
66
Pack="true"
77
PackagePath="\"

‎src/libraries/Silk.NET.Maths/Silk.NET.Maths.csproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,4 @@
1515
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1616
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1717
</PropertyGroup>
18-
19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.1">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
<PackageReference Include="Ultz.Bcl.Half" Version="1.0.0" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<AdditionalFiles Include="PublicAPI.Shipped.txt" />
30-
<AdditionalFiles Include="PublicAPI.Unshipped.txt" />
31-
</ItemGroup>
3218
</Project>

0 commit comments

Comments
 (0)