Fixed failure ArtifactCollector collecting nuget package artifacts. #80

kekyo · Jun 19, 2020 · 7c2441f · 7c2441f
1 parent 1080a52
commit 7c2441f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/ArtifactCollector/ArtifactCollector.exe b/ArtifactCollector/ArtifactCollector.exe
diff --git a/ArtifactCollector/Collectors.cs b/ArtifactCollector/Collectors.cs
@@ -115,6 +115,7 @@ public static async Task BuildCsprojAndCollectArtifactsAsync(
                     "pack",
                     "--no-build",
                     "--configuration", "Release",
+                    "-p:Platform=",   // BUG WORKAROUND: dotnet pack is misunderstanding Platform variable sets to "Any CPU", so have to set blank.
                     $"-p:BuildIdentifier={buildIdentifier}",
                     $"\"{path}\"");
                 Program.WriteLine(result.Item2);

diff --git a/IL2C.Core/IL2C.Core.csproj b/IL2C.Core/IL2C.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/IL2C.Interop/IL2C.Interop.csproj b/IL2C.Interop/IL2C.Interop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.0;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net40-client;net45;netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -33,6 +33,12 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net40-client'">
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="CenterCLR.RelaxVersioner" version="1.0.5" PrivateAssets="All" />
   </ItemGroup>

diff --git a/IL2C.Runtime/IL2C.Runtime.msvc.nuspec b/IL2C.Runtime/IL2C.Runtime.msvc.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/kekyo/IL2C.git</projectUrl>
     <description>A translator implementation of .NET intermediate language to C language.</description>
     <copyright>Copyright (c) 2017-2019 Kouji Matsui</copyright>
-    <tags>il2c cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
+    <tags>il2c native cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
     <repository type="git" url="https://github.com/kekyo/IL2C.git" />
     <dependencies>
       <dependency id="IL2C.Runtime" version="$version$" />

diff --git a/IL2C.Runtime/IL2C.Runtime.nuspec b/IL2C.Runtime/IL2C.Runtime.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/kekyo/IL2C.git</projectUrl>
     <description>A translator implementation of .NET intermediate language to C language.</description>
     <copyright>Copyright (c) 2017-2019 Kouji Matsui</copyright>
-    <tags>il2c cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
+    <tags>il2c native cil msil translate transpile aot ecma335 c c++ win32 uefi wdm multi-platform systems-programming</tags>
     <repository type="git" url="https://github.com/kekyo/IL2C.git" />
   </metadata>
   <files>

diff --git a/pack.bat b/pack.bat
@@ -2,14 +2,19 @@
 setlocal enabledelayedexpansion
 
 set TOOLCHAINPATH=%~dp0toolchain\gcc4
-set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.12
+set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.17
 
 if not exist %TOOLCHAINPATH% (
     echo Native toolchain not found.
     echo Execute "init-tools.bat" if build runtime at first time.
     exit /b 1
 )
 
+set BuildIdentifier=%1
+if "%BuildIdentifier%" == "" (
+    set BuildIdentifier=manually
+)
+
 rem if not exist ArtifactCollector\ArtifactCollector.exe (
 rem     echo ArtifactCollector not found.
 rem     echo Build il2c.sln first.
@@ -28,7 +33,7 @@ echo ///////////////////////////////////////////////
 echo // Build entire IL2C.pack.sln
 echo.
 
-dotnet build --configuration Release -p:BuildIdentifier="%1" il2c.pack.sln
+dotnet build --configuration Release -p:Platform="Any CPU" -p:BuildIdentifier="%BuildIdentifier%" il2c.pack.sln
 
 rem =========================================
 
@@ -37,7 +42,7 @@ echo ///////////////////////////////////////////////
 echo // Collects artifacts.
 echo.
 
-ArtifactCollector\ArtifactCollector.exe . .\artifacts "%1" IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
+ArtifactCollector\ArtifactCollector.exe . .\artifacts "%BuildIdentifier%" IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
 
 rem =========================================
 

diff --git a/pack.sh b/pack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=0.4.61
+VERSION=0.4.100
 
 rm -rf artifacts
 mkdir artifacts