Skip to content

Commit

Permalink
Merge branch 'feature/new-build-infrastructure' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
kekyo committed May 11, 2022
2 parents fb75b1d + 0236db7 commit cc27e3b
Show file tree
Hide file tree
Showing 583 changed files with 6,003 additions and 6,895 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.jpg filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.exe filter=lfs diff=lfs merge=lfs -text
15 changes: 12 additions & 3 deletions .github/workflows/build-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ jobs:
env:
buildConfiguration: ${{ matrix.buildConfiguration }}
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
lfs: true
# https://stackoverflow.com/questions/61463578/github-actions-actions-checkoutv2-lfs-true-flag-not-converting-pointers-to-act
- name: Checkout LFS objects
run: git lfs checkout
- name: Setup .NET Core 2.1
uses: actions/setup-dotnet@v1
with:
Expand All @@ -38,8 +43,12 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.402
- name: Initialize tools
run: bash ./init-tools.sh
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
#- name: Initialize tools
# run: bash .github/workflows/init-tools-on-ga.sh
- name: Install dependencies
run: |
dotnet restore il2c.sln
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ jobs:
env:
buildConfiguration: ${{ matrix.buildConfiguration }}
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
lfs: true
# https://stackoverflow.com/questions/61463578/github-actions-actions-checkoutv2-lfs-true-flag-not-converting-pointers-to-act
- name: Checkout LFS objects
run: git lfs checkout
- name: Setup .NET Core 2.1
uses: actions/setup-dotnet@v1
with:
Expand All @@ -38,6 +43,10 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.402
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
- name: Add msbuild to PATH
uses: microsoft/[email protected]
- name: Initialize tools
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/init-tools-on-ga.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
sudo -S apt-get update -y < /dev/null
sudo -S apt-get install build-essential cmake ninja-build mono-devel -y < /dev/null
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,4 @@ toolchain/

.idea/

logs/
Binary file modified .nuget/nuget.exe
Binary file not shown.
64 changes: 0 additions & 64 deletions ArtifactCollector/ArtifactCollector.csproj

This file was deleted.

36 changes: 36 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project>
<!-- Root common definitions -->

<PropertyGroup>
<RootNamespace>IL2C</RootNamespace>

<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
<PlatformTarget>AnyCPU</PlatformTarget>

<DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NoWarn>$(NoWarn);CS1570;CS1591;NU5105</NoWarn>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/kekyo/IL2C.git</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net40-client'">
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
</ItemGroup>

</Project>
56 changes: 0 additions & 56 deletions IL2C.Core/IL2C.Core.csproj

This file was deleted.

28 changes: 0 additions & 28 deletions IL2C.Core/Internal/ICombinedComparer.cs

This file was deleted.

31 changes: 0 additions & 31 deletions IL2C.Core/InvalidProgramSequenceException.cs

This file was deleted.

27 changes: 0 additions & 27 deletions IL2C.Core/Metadata/Attributes/NativeCharSetInformation.cs

This file was deleted.

28 changes: 0 additions & 28 deletions IL2C.Core/Metadata/IOperandPrintable.cs

This file was deleted.

24 changes: 0 additions & 24 deletions IL2C.Core/Properties/AssemblyInfo.cs

This file was deleted.

Loading

0 comments on commit cc27e3b

Please sign in to comment.