Skip to content

Commit cc27e3b

Browse files
committed
Merge branch 'feature/new-build-infrastructure' into devel
2 parents fb75b1d + 0236db7 commit cc27e3b

File tree

583 files changed

+6003
-6895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

583 files changed

+6003
-6895
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.jpg filter=lfs diff=lfs merge=lfs -text
22
*.png filter=lfs diff=lfs merge=lfs -text
3+
*.exe filter=lfs diff=lfs merge=lfs -text

.github/workflows/build-linux.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ jobs:
2323
env:
2424
buildConfiguration: ${{ matrix.buildConfiguration }}
2525
steps:
26-
- uses: actions/checkout@v2
26+
- name: Checkout
27+
uses: actions/checkout@v2
2728
with:
2829
fetch-depth: 0
30+
lfs: true
31+
# https://stackoverflow.com/questions/61463578/github-actions-actions-checkoutv2-lfs-true-flag-not-converting-pointers-to-act
32+
- name: Checkout LFS objects
33+
run: git lfs checkout
2934
- name: Setup .NET Core 2.1
3035
uses: actions/setup-dotnet@v1
3136
with:
@@ -38,8 +43,12 @@ jobs:
3843
uses: actions/setup-dotnet@v1
3944
with:
4045
dotnet-version: 5.0.402
41-
- name: Initialize tools
42-
run: bash ./init-tools.sh
46+
- name: Setup .NET 6
47+
uses: actions/setup-dotnet@v1
48+
with:
49+
dotnet-version: 6.0.100
50+
#- name: Initialize tools
51+
# run: bash .github/workflows/init-tools-on-ga.sh
4352
- name: Install dependencies
4453
run: |
4554
dotnet restore il2c.sln

.github/workflows/build-windows.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ jobs:
2323
env:
2424
buildConfiguration: ${{ matrix.buildConfiguration }}
2525
steps:
26-
- uses: actions/checkout@v2
26+
- name: Checkout
27+
uses: actions/checkout@v2
2728
with:
2829
fetch-depth: 0
30+
lfs: true
31+
# https://stackoverflow.com/questions/61463578/github-actions-actions-checkoutv2-lfs-true-flag-not-converting-pointers-to-act
32+
- name: Checkout LFS objects
33+
run: git lfs checkout
2934
- name: Setup .NET Core 2.1
3035
uses: actions/setup-dotnet@v1
3136
with:
@@ -38,6 +43,10 @@ jobs:
3843
uses: actions/setup-dotnet@v1
3944
with:
4045
dotnet-version: 5.0.402
46+
- name: Setup .NET 6
47+
uses: actions/setup-dotnet@v1
48+
with:
49+
dotnet-version: 6.0.100
4150
- name: Add msbuild to PATH
4251
uses: microsoft/setup-msbuild@v1.0.3
4352
- name: Initialize tools

.github/workflows/init-tools-on-ga.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
sudo -S apt-get update -y < /dev/null
3+
sudo -S apt-get install build-essential cmake ninja-build mono-devel -y < /dev/null

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -248,3 +248,4 @@ toolchain/
248248

249249
.idea/
250250

251+
logs/

.nuget/nuget.exe

1.29 MB
Binary file not shown.

ArtifactCollector/ArtifactCollector.csproj

-64
This file was deleted.

Directory.Build.props

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<!-- Root common definitions -->
3+
4+
<PropertyGroup>
5+
<RootNamespace>IL2C</RootNamespace>
6+
7+
<LangVersion>latest</LangVersion>
8+
<Nullable>disable</Nullable>
9+
<PlatformTarget>AnyCPU</PlatformTarget>
10+
11+
<DebugSymbols>true</DebugSymbols>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
14+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
15+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
16+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
18+
<Deterministic>true</Deterministic>
19+
<NoWarn>$(NoWarn);CS1570;CS1591;NU5105</NoWarn>
20+
21+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22+
<RepositoryType>git</RepositoryType>
23+
<RepositoryUrl>https://github.com/kekyo/IL2C.git</RepositoryUrl>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(TargetFramework)' == 'net40-client'">
27+
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
28+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
29+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
30+
</PropertyGroup>
31+
32+
<ItemGroup>
33+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
34+
</ItemGroup>
35+
36+
</Project>

IL2C.Core/IL2C.Core.csproj

-56
This file was deleted.

IL2C.Core/Internal/ICombinedComparer.cs

-28
This file was deleted.

IL2C.Core/InvalidProgramSequenceException.cs

-31
This file was deleted.

IL2C.Core/Metadata/Attributes/NativeCharSetInformation.cs

-27
This file was deleted.

IL2C.Core/Metadata/IOperandPrintable.cs

-28
This file was deleted.

IL2C.Core/Properties/AssemblyInfo.cs

-24
This file was deleted.

0 commit comments

Comments
 (0)