Skip to content

Commit 7c2441f

Browse files
kekyokekyo
committed
Fixed failure ArtifactCollector collecting nuget package artifacts. #80 
1 parent 1080a52 commit 7c2441f

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed

‎ArtifactCollector/ArtifactCollector.exe

-2 KB
Binary file not shown.

‎ArtifactCollector/Collectors.cs

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public static async Task BuildCsprojAndCollectArtifactsAsync(
115115
"pack",
116116
"--no-build",
117117
"--configuration", "Release",
118+
"-p:Platform=", // BUG WORKAROUND: dotnet pack is misunderstanding Platform variable sets to "Any CPU", so have to set blank.
118119
$"-p:BuildIdentifier={buildIdentifier}",
119120
$"\"{path}\"");
120121
Program.WriteLine(result.Item2);

‎IL2C.Core/IL2C.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard2.0;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

‎IL2C.Interop/IL2C.Interop.csproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netstandard1.0;netstandard2.0;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net40-client;net45;netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -33,6 +33,12 @@
3333
<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3434
</PropertyGroup>
3535

36+
<PropertyGroup Condition="'$(TargetFramework)' == 'net40-client'">
37+
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
38+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
39+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
40+
</PropertyGroup>
41+
3642
<ItemGroup>
3743
<PackageReference Include="CenterCLR.RelaxVersioner" version="1.0.5" PrivateAssets="All" />
3844
</ItemGroup>

‎IL2C.Runtime/IL2C.Runtime.msvc.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<projectUrl>https://github.com/kekyo/IL2C.git</projectUrl>
1111
<description>A translator implementation of .NET intermediate language to C language.</description>
1212
<copyright>Copyright (c) 2017-2019 Kouji Matsui</copyright>
13-
<tags>il2c cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
13+
<tags>il2c native cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
1414
<repository type="git" url="https://github.com/kekyo/IL2C.git" />
1515
<dependencies>
1616
<dependency id="IL2C.Runtime" version="$version$" />

‎IL2C.Runtime/IL2C.Runtime.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<projectUrl>https://github.com/kekyo/IL2C.git</projectUrl>
1111
<description>A translator implementation of .NET intermediate language to C language.</description>
1212
<copyright>Copyright (c) 2017-2019 Kouji Matsui</copyright>
13-
<tags>il2c cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
13+
<tags>il2c native cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
1414
<repository type="git" url="https://github.com/kekyo/IL2C.git" />
1515
</metadata>
1616
<files>

‎pack.bat

+8-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
setlocal enabledelayedexpansion
33

44
set TOOLCHAINPATH=%~dp0toolchain\gcc4
5-
set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.12
5+
set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.17
66

77
if not exist %TOOLCHAINPATH% (
88
echo Native toolchain not found.
99
echo Execute "init-tools.bat" if build runtime at first time.
1010
exit /b 1
1111
)
1212

13+
set BuildIdentifier=%1
14+
if "%BuildIdentifier%" == "" (
15+
set BuildIdentifier=manually
16+
)
17+
1318
rem if not exist ArtifactCollector\ArtifactCollector.exe (
1419
rem echo ArtifactCollector not found.
1520
rem echo Build il2c.sln first.
@@ -28,7 +33,7 @@ echo ///////////////////////////////////////////////
2833
echo // Build entire IL2C.pack.sln
2934
echo.
3035

31-
dotnet build --configuration Release -p:BuildIdentifier="%1" il2c.pack.sln
36+
dotnet build --configuration Release -p:Platform="Any CPU" -p:BuildIdentifier="%BuildIdentifier%" il2c.pack.sln
3237

3338
rem =========================================
3439

@@ -37,7 +42,7 @@ echo ///////////////////////////////////////////////
3742
echo // Collects artifacts.
3843
echo.
3944

40-
ArtifactCollector\ArtifactCollector.exe . .\artifacts "%1" IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
45+
ArtifactCollector\ArtifactCollector.exe . .\artifacts "%BuildIdentifier%" IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
4146

4247
rem =========================================
4348

‎pack.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION=0.4.61
3+
VERSION=0.4.100
44

55
rm -rf artifacts
66
mkdir artifacts

0 commit comments

Comments
 (0)