Skip to content
Merged
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
7 changes: 1 addition & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
# Auto detect text files and perform LF normalization
*.verified.cs text eol=lf working-tree-encoding=UTF-8
* text=auto

*.cs diff=csharp
*.html diff=html
*.sln merge=union
*.csproj merge=union
48 changes: 22 additions & 26 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

<Net9PackageVersion>9.0.17</Net9PackageVersion>
<Net10PackageVersion>10.0.9</Net10PackageVersion>
<Net11PackageVersion>11.0.0-preview.5.26302.115</Net11PackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AssemblyMetadata.Generators" Version="2.2.0" />
<PackageVersion Include="Immediate.Handlers" Version="3.8.1" />
<PackageVersion Include="Immediate.Handlers" Version="3.11.1" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.9.0" />
<PackageVersion Include="Scriban" Version="7.2.5" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
<PackageVersion Include="Verify.XunitV3" Version="31.20.0" />
<PackageVersion Include="Verify.XunitV3" Version="31.25.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
</ItemGroup>

<!-- IV.Shared dependencies -->
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
Expand All @@ -31,30 +27,30 @@
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="$(Net9PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(Net9PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(Net9PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(Net9PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.18" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net10.0'">
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.9" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.300" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="$(Net10PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(Net10PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(Net10PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(Net10PackageVersion)" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net11.0'">
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.9" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="$(Net11PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(Net11PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(Net11PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(Net11PackageVersion)" />
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>

<!-- IV.Generators dependencies -->
Expand Down Expand Up @@ -95,7 +91,7 @@

<ItemGroup>
<GlobalPackageReference Include="DotNet.ReproducibleBuilds" Version="2.0.5" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.122" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.123" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.157" PrivateAssets="All" />
<GlobalPackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ CancellationToken token
Assert.Equal(
[
"Immediate.Cache.Generators/Immediate.Cache.Generators.ImmediateCacheGenerator/IC.ServiceCollectionExtensions.g.cs",
"Immediate.Handlers.Generators/Immediate.Handlers.Generators.ImmediateHandlersGenerator/IH.ServiceCollectionExtensions.g.cs",
],
result.GeneratedTrees.Select(t => t.FilePath.Replace('\\', '/'))
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Immediate.Cache.Tests/Immediate.Cache.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="all" GeneratePathProperty="true" />

<Reference Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"
<Reference Condition=" '$(TargetFramework)' != 'net10.0' "
Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
<Reference Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"
<Reference Condition=" '$(TargetFramework)' == 'net10.0' "
Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)\analyzers\dotnet\Microsoft.CodeAnalysis.NetAnalyzers.dll" />

<Reference Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Immediate.Cache.Tests/Utility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal static partial class Utility
"net11.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"11.0.0-preview.5.26302.115"
"11.0.0-preview.6.26359.118"
),
Path.Combine("ref", "net11.0")
);
Expand Down