未验证 提交 8f0a4a53 编写于 作者: J Jose Perez Rodriguez 提交者: GitHub

Adding netstandard ridless configuration (#479)

* Adding netstandard ridless configuration

* Applying PR feedback
上级 1d5b7879
...@@ -18,7 +18,13 @@ ...@@ -18,7 +18,13 @@
<!-- Packaging Targets --> <!-- Packaging Targets -->
<PropertyGroup> <PropertyGroup>
<IncludeRIDSpecificBuildOutput Condition="'$(IncludeRIDSpecificBuildOutput)' == '' And '$(RuntimeIdentifiers)' != ''">true</IncludeRIDSpecificBuildOutput> <IncludeRIDSpecificBuildOutput Condition="'$(IncludeRIDSpecificBuildOutput)' == '' And '$(RuntimeIdentifiers)' != ''">true</IncludeRIDSpecificBuildOutput>
<TargetsForTfmSpecificContentInPackage Condition="'$(IncludeRIDSpecificBuildOutput)' == 'true'">$(TargetsForTfmSpecificContentInPackage);_WalkEachRIDForBuildOutput;_GetReferenceAssemblyForPackage;_GetNativeAssetsForPackage</TargetsForTfmSpecificContentInPackage> <TargetsForTfmSpecificContentInPackage Condition="'$(IncludeRIDSpecificBuildOutput)' == 'true'">
$(TargetsForTfmSpecificContentInPackage);
_WalkEachRIDForBuildOutput;
_GetReferenceAssemblyForPackage;
_GetTurdAssemblyForPackage;
_GetNativeAssetsForPackage
</TargetsForTfmSpecificContentInPackage>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -46,6 +52,14 @@ ...@@ -46,6 +52,14 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="_GetTurdAssemblyForPackage">
<ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)notsupported\$(MSBuildProjectName).dll">
<PackagePath>lib/$(TargetFramework)</PackagePath>
</TfmSpecificPackageFile>
</ItemGroup>
</Target>
<Target Name="_GetNativeAssetsForPackage"> <Target Name="_GetNativeAssetsForPackage">
<ItemGroup> <ItemGroup>
<_nativeAssetsToPackage Include="$(BaseOutputPath)../Native/Release/*.so" /> <_nativeAssetsToPackage Include="$(BaseOutputPath)../Native/Release/*.so" />
......
...@@ -11,13 +11,17 @@ ...@@ -11,13 +11,17 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19305.13"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19306.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> <Sha>e7d945791b57aa3896b49eb6f627a79dd3a3a8b7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19305.13"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19306.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> <Sha>e7d945791b57aa3896b49eb6f627a79dd3a3a8b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19306.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7d945791b57aa3896b49eb6f627a79dd3a3a8b7</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
...@@ -4,5 +4,6 @@ ...@@ -4,5 +4,6 @@
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel> <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<SystemDeviceGpioPackageVersion>0.1.0-prerelease.19305.1</SystemDeviceGpioPackageVersion> <SystemDeviceGpioPackageVersion>0.1.0-prerelease.19305.1</SystemDeviceGpioPackageVersion>
<IotDeviceBindingsPackageVersion>0.1.0-prerelease.19305.1</IotDeviceBindingsPackageVersion> <IotDeviceBindingsPackageVersion>0.1.0-prerelease.19305.1</IotDeviceBindingsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19306.3</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
...@@ -157,15 +157,15 @@ fetch_tizen_pkgs() ...@@ -157,15 +157,15 @@ fetch_tizen_pkgs()
Inform "Initialize arm base" Inform "Initialize arm base"
fetch_tizen_pkgs_init standard base fetch_tizen_pkgs_init standard base
Inform "fetch common packages" Inform "fetch common packages"
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic
fetch_tizen_pkgs noarch linux-glibc-devel fetch_tizen_pkgs noarch linux-glibc-devel
Inform "fetch coreclr packages" Inform "fetch coreclr packages"
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel tizen-release lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
Inform "fetch corefx packages" Inform "fetch corefx packages"
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel
Inform "Initialize standard unified" Inform "Initialize standard unified"
fetch_tizen_pkgs_init standard unified fetch_tizen_pkgs_init standard unified
Inform "fetch corefx packages" Inform "fetch corefx packages"
fetch_tizen_pkgs armv7l gssdp gssdp-devel fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"version": "3.0.100-preview5-011568" "version": "3.0.100-preview5-011568"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13", "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19306.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19305.13" "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19306.3"
} }
} }
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
<!-- Only produce reference assembly in one of our inner builds --> <!-- Only produce reference assembly in one of our inner builds -->
<ProduceReferenceAssembly Condition="'$(TargetsLinux)' == 'true'">true</ProduceReferenceAssembly> <ProduceReferenceAssembly Condition="'$(TargetsLinux)' == 'true'">true</ProduceReferenceAssembly>
<TargetRefPath>$(OutputPath)$(TargetFramework)\$(MSBuildProjectName).dll</TargetRefPath> <TargetRefPath>$(OutputPath)$(TargetFramework)\ref\$(MSBuildProjectName).dll</TargetRefPath>
<IsPackable>true</IsPackable> <IsPackable>true</IsPackable>
<GeneratePlatformNotSupportedAssembly Condition="'$(RuntimeIdentifier)' == ''">true</GeneratePlatformNotSupportedAssembly>
<Configurations>Debug;Release;Windows-Debug;Linux-Debug</Configurations> <Configurations>Debug;Release;Windows-Debug;Linux-Debug</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -19,11 +20,15 @@ ...@@ -19,11 +20,15 @@
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
<PackageReference Include="System.Memory" Version="4.5.1" /> <PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" /> <!-- This is Windows specific --> <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" /> <!-- This is Windows specific -->
<PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsLinux)' == 'true'"> <ItemGroup Condition="'$(TargetsLinux)' == 'true'">
<!--Excluding Windows implementations--> <!--Excluding Windows implementations-->
<Compile Remove="**\*.Windows.cs" /> <Compile Remove="**\*.Windows.cs" />
<Compile Remove="Interop\Windows\**\*.cs" /> <Compile Remove="Interop\Windows\**\*.cs" />
<CreateDirectory Include="$(OutputPath)..\ref\" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<!--Excluding Linux implementations--> <!--Excluding Linux implementations-->
...@@ -42,4 +47,26 @@ ...@@ -42,4 +47,26 @@
<IsWinMDFile>true</IsWinMDFile> <IsWinMDFile>true</IsWinMDFile>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<Target Name="SetupEnvironmentForNotSupportedAssembly">
<PropertyGroup>
<OutDir>$(OutDir)notsupported\</OutDir>
<ProjectDepsFilePath>$(OutDir)$(ProjectDepsFileName)</ProjectDepsFilePath>
</PropertyGroup>
<ItemGroup>
<Compile Remove="@(Compile)" />
<CreateDirectory Include="$(OutputPath)notsupported\" />
</ItemGroup>
</Target>
<Target Name="ResolveMatchingContract">
<ItemGroup>
<ResolvedMatchingContract Include="$(OutputPath)ref\$(MSBuildProjectName).dll" />
</ItemGroup>
</Target>
<Target Name="BuildNotSupportedAssembly"
Condition="'$(RuntimeIdentifier)' == ''"
AfterTargets="Build"
DependsOnTargets="SetupEnvironmentForNotSupportedAssembly;$(BuildDependsOn)" />
</Project> </Project>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册