Updating internal Pure.DI to 2.1.39

DevTeam · Nov 20, 2024 · a713af6 · a713af6
1 parent b6f1c2c
commit a713af6
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 32 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <InternalVersion>2.1.38</InternalVersion>
+        <InternalVersion>2.1.39</InternalVersion>
         <BasePackageId>Pure.DI</BasePackageId>
         <LangVersion>latest</LangVersion>
         <BaseTargetFramework>net8.0</BaseTargetFramework>

diff --git a/readme/Avalonia.md b/readme/Avalonia.md
@@ -176,7 +176,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
@@ -70,11 +70,11 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
@@ -69,11 +69,11 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/Console.md b/readme/Console.md
@@ -89,7 +89,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/ConsoleNativeAOT.md b/readme/ConsoleNativeAOT.md
@@ -16,7 +16,7 @@ The [project file](/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.cs
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
@@ -74,7 +74,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/GrpcService.md b/readme/GrpcService.md
@@ -55,11 +55,11 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/Maui.md b/readme/Maui.md
@@ -211,11 +211,11 @@ The [project file](/samples/MAUIApp/MAUIApp.csproj) looks like this:
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0"/>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md
@@ -78,11 +78,11 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/WebAPI.md b/readme/WebAPI.md
@@ -53,11 +53,11 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/WebApp.md b/readme/WebApp.md
@@ -53,11 +53,11 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.36" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
     </ItemGroup>
 
 </Project>

diff --git a/readme/WinFormsApp.md b/readme/WinFormsApp.md
@@ -60,7 +60,7 @@ The [project file](/samples/WinFormsApp/WinFormsApp.csproj) looks like this:
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md
@@ -66,7 +66,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/Wpf.md b/readme/Wpf.md
@@ -112,7 +112,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.38">
+        <PackageReference Include="Pure.DI" Version="2.1.39">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/threadsafe-hint.md b/readme/threadsafe-hint.md
@@ -20,7 +20,7 @@ class Service(Func<IDependency> dependencyFactory) : IService;
 DI.Setup(nameof(Composition))
     .Hint(ThreadSafe, "Off")
     .Bind().To<Dependency>()
-    .Bind().As(Lifetime.Scoped).To<Service>()
+    .Bind().As(Lifetime.Singleton).To<Service>()
     .Root<IService>("Root");
 
 var composition = new Composition();
@@ -36,7 +36,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  private Service? _scopedService40;
+  private Service? _singletonService40;
 
   [OrdinalAttribute(20)]
   public Composition()
@@ -54,17 +54,17 @@ partial class Composition
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     get
     {
-      if (_scopedService40 == null)
+      if (_root._singletonService40 == null)
       {
         Func<IDependency> perBlockFunc0 = new Func<IDependency>([MethodImpl(MethodImplOptions.AggressiveInlining)] () =>
         {
           IDependency localValue71 = new Dependency();
           return localValue71;
         });
-        _scopedService40 = new Service(perBlockFunc0);
+        _root._singletonService40 = new Service(perBlockFunc0);
       }
 
-      return _scopedService40!;
+      return _root._singletonService40!;
     }
   }
 }

diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 
 #if !PUREDI_API_FUNC_SUPPRESSION

diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 namespace Pure.DI
 {    

diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 
 namespace Pure.DI

diff --git a/src/Pure.DI.Core/Pure.DI.Core.csproj b/src/Pure.DI.Core/Pure.DI.Core.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>$(BasePackageId)</RootNamespace>
-        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V1</DefineConstants>
+        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V2</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/Pure.DI.UsageTests/Hints/ThreadSafeHintScenario.cs b/tests/Pure.DI.UsageTests/Hints/ThreadSafeHintScenario.cs
@@ -41,7 +41,7 @@ public void Run()
         DI.Setup(nameof(Composition))
             .Hint(ThreadSafe, "Off")
             .Bind().To<Dependency>()
-            .Bind().As(Lifetime.Scoped).To<Service>()
+            .Bind().As(Lifetime.Singleton).To<Service>()
             .Root<IService>("Root");
 
         var composition = new Composition();