Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<!--<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>-->
</PropertyGroup>

<ItemGroup>
<None Include="Targets\mappergenerator.props" Pack="true" PackagePath="build/$(PackageId).props" />
<None Include="Targets\mappergenerator.targets" Pack="true" PackagePath="build/$(PackageId).targets" />
</ItemGroup>

<ItemGroup>
<!-- Dependency DLLs -->
<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.Mapper.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Het project dat deze package gebruikt, is geen source-generator

<!-- Put the assets for this project in the correct package path -->
<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
<None Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsMapper</GetTargetPathDependsOn>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Het project dat deze package gebruikt, is geen source-generator

</PropertyGroup>

<Target Name="GetDependencyTargetPathsMapper">
<!-- Include dependency DLLs and put them in the correct package path -->
<ItemGroup>
<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_Mapper_Attributes)\lib\netstandard2.0\MintPlayer.Mapper.Attributes.dll" IncludeRuntimeDependency="true" />
</ItemGroup>
</Target>

<Target Name="MapperGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
<Error Condition="'$(PkgMintPlayer_MapperGenerator_Attributes)' == ''"
Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.MapperGenerator.Attributes PackageReference." />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<PropertyGroup>
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsDependencyInjection</GetTargetPathDependsOn>
</PropertyGroup>
Expand All @@ -27,4 +19,9 @@
<TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Extensions_DependencyInjection_Abstractions)\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
</Target>

<Target Name="MintPlayer_DependencyInjection_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
<Error Condition="'$(PkgMicrosoft_Extensions_DependencyInjection_Abstractions)' == ''"
Text="Please add GeneratePathProperty=&quot;true&quot; on the Microsoft.Extensions.DependencyInjection.Abstractions PackageReference." />
</Target>
</Project>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
<PackageReference Include="Newtonsoft.Json" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="MintPlayer.ValueComparers.NewtonsoftJson" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="MintPlayer.ValueComparers.NewtonsoftJson" Version="5.3.0" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<PropertyGroup>
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsNewtonsoftJson</GetTargetPathDependsOn>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Het project dat deze package gebruikt, is geen source-generator

</PropertyGroup>
Expand All @@ -32,4 +22,11 @@
<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_ValueComparers_NewtonsoftJson)\lib\netstandard2.0\MintPlayer.ValueComparers.NewtonsoftJson.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
</Target>

<Target Name="MintPlayer_NewtonsoftJson_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
<Error Condition="'$(PkgNewtonsoft_Json)' == ''"
Text="Please add GeneratePathProperty=&quot;true&quot; on the Newtonsoft.Json PackageReference." />
<Error Condition="'$(PkgMintPlayer_ValueComparers_NewtonsoftJson)' == ''"
Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.ValueComparers.NewtonsoftJson PackageReference." />
</Target>
</Project>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@

<Target Name="GetDependencyTargetPathsCommon">
<!-- Include dependency DLLs and put them in the correct package path -->
<ItemGroup>
<ItemGroup Condition="'$(PkgMintPlayer_SourceGenerators_Tools)' != ''">
<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_SourceGenerators_Tools)\lib\netstandard2.0\MintPlayer.SourceGenerators.Tools.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
<ItemGroup Condition="'$(PkgMintPlayer_SourceGenerators_Tools)' == '' and Exists('$(MSBuildThisFileDirectory)..\MintPlayer.SourceGenerators.Tools')">
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\MintPlayer.SourceGenerators.Tools.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
</Target>

<Target Name="MapperGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</PropertyGroup>

<ItemGroup>
<!-- FSR attribute assemblies should not be with a roslyn version path -->
<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
<None Include="Targets\valuecomparergenerator.props" Pack="true" PackagePath="build/$(PackageId).props" />
<None Include="Targets\valuecomparergenerator.targets" Pack="true" PackagePath="build/$(PackageId).targets" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Producers\ValueComparersProducer.cs" />
</ItemGroup>
<!--<ItemGroup>
<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
</ItemGroup>-->

<ItemGroup>
<ProjectReference Include="..\MintPlayer.ValueComparerGenerator.Attributes\MintPlayer.ValueComparerGenerator.Attributes.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<!-- Put the assets for this project in the correct package path -->
<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
<None Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsValueComparer</GetTargetPathDependsOn>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Het project dat deze package gebruikt, is geen source-generator

</PropertyGroup>

<Target Name="GetDependencyTargetPathsValueComparer">
<!-- Include dependency DLLs and put them in the correct package path -->
<ItemGroup Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' != ''">
<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\MintPlayer.ValueComparerGenerator.Attributes.dll" IncludeRuntimeDependency="true" />
</ItemGroup>
<ItemGroup Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' == '' and Exists('$(MSBuildThisFileDirectory)..\MintPlayer.ValueComparerGenerator.Attributes')">
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\MintPlayer.ValueComparerGenerator.Attributes.dll" IncludeRuntimeDependency="true" />
</ItemGroup>
</Target>

<Target Name="ValueComparerGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
<Error Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' == ''"
Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.ValueComparerGenerator.Attributes PackageReference." />
</Target>
</Project>
38 changes: 0 additions & 38 deletions SourceGenerators/eng/sourcegenerator.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,6 @@
<RoslynVersion></RoslynVersion>
</PropertyGroup>

<Choose>
<When Condition="$(RoslynVersion) == 'roslyn4.0'">
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.0.1" PrivateAssets="all" />-->
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);ROSLYN_4_0;ROSLYN_4_0_OR_GREATER</DefineConstants>
</PropertyGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.9.2" PrivateAssets="all" />-->
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);ROSLYN_4_9;ROSLYN_4_0_OR_GREATER;ROSLYN_4_9_OR_GREATER</DefineConstants>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\MintPlayer.SourceGenerators.Tools.csproj" PrivateAssets="all" />
</ItemGroup>
Expand All @@ -48,17 +21,6 @@
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsCommon</GetTargetPathDependsOn>
</PropertyGroup>

<ItemGroup>
<!-- Put the assets for this project in the correct package path -->
<!-- Rolsyn 4.0 -->
<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="false" />
<None Condition="'$(Configuration)' == 'Release' " Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="false" />

<!-- Rolsyn 4.9 -->
<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="false" />
<None Condition="'$(Configuration)' == 'Release' " Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="false" />
</ItemGroup>

<Target Name="GetDependencyTargetPathsCommon">
<!-- Include dependency DLLs and put them in the correct package path -->
<ItemGroup>
Expand Down
Loading