Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix nuget package content #167

Merged
merged 4 commits into from
Jul 15, 2023
Merged

Fix nuget package content #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbb8aa1
use latest release DotNetDev.ArcadeLight.Sdk
Bertk Jul 14, 2023
3b90c54
Merge branch 'main' of https://github.com/Bertk/arcade-light
Bertk Jul 14, 2023
ed4613c
fix-nuget-package
Bertk Jul 15, 2023
7f07ea4
remove DotNetDev.ArcadeLight.Common
Bertk Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions Arcade-light.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Internal.DependencyI
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetDev.ArcadeLight.Logging", "src\DotNetDev.ArcadeLight.Logging\DotNetDev.ArcadeLight.Logging.csproj", "{73496668-336D-4D43-9093-C17862E78BCE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetDev.ArcadeLight.Common", "src\Common\DotNetDev.ArcadeLight.Common\DotNetDev.ArcadeLight.Common.csproj", "{CE0834DF-707B-4998-8767-92E1478152AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetDev.ArcadeLight.Test.Common", "src\Common\DotNetDev.ArcadeLight.Test.Common\DotNetDev.ArcadeLight.Test.Common.csproj", "{6CA09DC9-E654-4906-A977-1279F6EDC109}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B5CFEC5E-6116-4AF3-B08E-B46360AB8711}"
Expand Down Expand Up @@ -96,18 +94,6 @@ Global
{73496668-336D-4D43-9093-C17862E78BCE}.Release|x64.Build.0 = Release|Any CPU
{73496668-336D-4D43-9093-C17862E78BCE}.Release|x86.ActiveCfg = Release|Any CPU
{73496668-336D-4D43-9093-C17862E78BCE}.Release|x86.Build.0 = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|x64.ActiveCfg = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|x64.Build.0 = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|x86.ActiveCfg = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Debug|x86.Build.0 = Debug|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|Any CPU.Build.0 = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|x64.ActiveCfg = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|x64.Build.0 = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|x86.ActiveCfg = Release|Any CPU
{CE0834DF-707B-4998-8767-92E1478152AF}.Release|x86.Build.0 = Release|Any CPU
{6CA09DC9-E654-4906-A977-1279F6EDC109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CA09DC9-E654-4906-A977-1279F6EDC109}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CA09DC9-E654-4906-A977-1279F6EDC109}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
24 changes: 12 additions & 12 deletions eng/BuildTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,24 @@
Do not include assemblies that MSBuild ships with in the package.
-->

<PackageReference Update="System.Collections.Immutable" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.IO.Compression" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.Threading.Tasks.Dataflow" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.Collections.Immutable" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.IO.Compression" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="System.Threading.Tasks.Dataflow" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Update="Microsoft.Build" VersionOverride="17.3.2" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Framework" VersionOverride="17.3.2" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build" VersionOverride="17.3.2" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Framework" VersionOverride="17.3.2" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<PackageReference Update="Microsoft.Build" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Framework" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Tasks.Core" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Utilities.Core" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build" VersionOverride="17.6.3" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Framework" VersionOverride="17.6.3" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Tasks.Core" VersionOverride="17.6.3" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
<PackageReference Update="Microsoft.Build.Utilities.Core" VersionOverride="17.6.3" PrivateAssets="all" Publish="false" ExcludeAssets="runtime" />
</ItemGroup>

<PropertyGroup Condition="'$(PackTasks)' == 'true'">
Expand Down
4 changes: 2 additions & 2 deletions src/Common/DotNetDev.ArcadeLight.Common/DotNetDev.ArcadeLight.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" />
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build.Utilities.Core" />
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Common/DotNetDev.ArcadeLight.Test.Common/DotNetDev.ArcadeLight.Test.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,4 @@
<PackageReference Include="xunit.extensibility.execution" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DotNetDev.ArcadeLight.Common\DotNetDev.ArcadeLight.Common.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/DotNetDev.ArcadeLight.Logging/DotNetDev.ArcadeLight.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" />
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" PrivateAssets="all"/>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build.Tasks.Core" />
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/DotNetDev.ArcadeLight.Sdk.Tests/DotNetDev.ArcadeLight.Sdk.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetCurrent)</TargetFrameworks>
Expand All @@ -13,7 +13,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Common\DotNetDev.ArcadeLight.Common\DotNetDev.ArcadeLight.Common.csproj" />
<ProjectReference Include="..\Common\DotNetDev.ArcadeLight.Test.Common\DotNetDev.ArcadeLight.Test.Common.csproj" />
<ProjectReference Include="..\DotNetDev.ArcadeLight.Sdk\DotNetDev.ArcadeLight.Sdk.csproj" />
<ProjectReference Include="..\DotNet.Internal.DependencyInjection.Testing\DotNet.Internal.DependencyInjection.Testing.csproj" />
Expand All @@ -28,6 +27,7 @@

<ItemGroup Condition=" '$(TargetFramework)' != '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build" />
<PackageReference Include="Microsoft.Build.Utilities.Core" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/DotNetDev.ArcadeLight.Sdk/DotNetDev.ArcadeLight.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetMinimum);$(NetCurrent)</TargetFrameworks>
Expand Down Expand Up @@ -32,10 +32,12 @@

<ItemGroup Condition=" '$(TargetFramework)' == '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build" VersionOverride="17.3.2" />
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.2" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != '$(NetMinimum)' ">
<PackageReference Include="Microsoft.Build" />
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
</ItemGroup>


Expand All @@ -55,7 +57,7 @@
<None Include="sdk/Sdk.props;sdk/Sdk.targets" Pack="true">
<PackagePath>sdk/%(Filename)%(Extension)</PackagePath>
</None>
<None Include="docs\README.md" Pack="true" PackagePath="\"/>
<None Include="docs\README.md" Pack="true" PackagePath="\" />
<None Include="tools/**/*.*" Pack="true">
<PackagePath>tools/%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
</None>
Expand All @@ -67,7 +69,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\DotNetDev.ArcadeLight.Common\DotNetDev.ArcadeLight.Common.csproj" />
<ProjectReference Include="..\DotNetDev.ArcadeLight.Logging\DotNetDev.ArcadeLight.Logging.csproj" />
</ItemGroup>

Expand Down