发布最新依赖版本

dotnetcore · Dec 9, 2024 · 91558fe · 91558fe
1 parent 8ec0388
commit 91558fe
Show file tree

Hide file tree

Showing 33 changed files with 275 additions and 110 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,35 +80,6 @@ jobs:
     - name: 📄 Achive Project
       run: dotnet test './test/workflow/Workflow.Runner' --nologo -c Release
 
-
-
-  publish:
-
-    runs-on: ubuntu-latest
-    needs: prepare_check
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: 🔨 Setup .NET SDK
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          3.1.x
-          5.0.x
-          6.0.x
-          7.0.x
-          8.0.x
-          9.0.x
-
-    - name: ✊ Release Dll
-      run: dotnet build -c Release
-
-    - name: 🚦 Check & Pack Nuget
-      run: dotnet test './test/workflow/Workflow.Nuget.Publish' --nologo --no-restore --no-build -c Release
-
-    - name: 📶 Push to Nuget
-      if:  ${{ needs.prepare_check.outputs.hasNugetKey == 'true' }}
-      run: dotnet nuget push *.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
 
   release:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,6 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 发布日志节点案例格式如下(支持多版本发布):
 
-
 Example:
 
 ## [9.0.0.0] - 2024-11-13 
@@ -53,21 +52,54 @@ Example:
 ### DotNetCore.Natasha.CSharp.HotExecutor.SG _ v9.0.0.1:
 - 热执行的 SG 扩展库.
 - 跟随其他扩展库版本号发布.
+
+### DotNetCore.Natasha.CSharp.Template.Core _ v9.0.0.3:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.Codecov _ v9.0.0.3:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.Ambiguity _ v9.0.0.3:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.MethodCreator _ v9.0.0.3:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.CompileDirector _ v9.0.0.3:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.HotExecutor _ v9.0.0.7:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.HotExecutor.Wrapper _ v9.0.0.8:
+- 跟随 Compiler 升级依赖.
 -->
 
-## [9.0.0.1] - 2024-11-13 
+## [9.0.0.3] - 2024-12-09 
 
-### DotNetCore.Natasha.CSharp.HotExecutor _ v9.0.0.3:
-- 基于 Natasha 的热执行，允许程序在运行时更改代码，并输出新的结果.
-- 跟随其他扩展库版本号发布.
+### DotNetCore.Natasha.CSharp.Compiler _ v9.0.0.4:
+- 修复 targets 文件.
 
-### DotNetCore.Natasha.CSharp.HotExecutor.SG _ v9.0.0.3:
-- 热执行的 SG 扩展库.
-- 跟随其他扩展库版本号发布.
-- 
-### DotNetCore.Natasha.CSharp.HotExecutor.Wrapper _ v9.0.0.4:
-- 热执行 + SG 封装库.
-- 跟随其他扩展库版本号发布.
+### DotNetCore.Natasha.CSharp.Template.Core _ v9.0.0.4:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.Codecov _ v9.0.0.4:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.Ambiguity _ v9.0.0.4:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.MethodCreator _ v9.0.0.4:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.Extension.CompileDirector _ v9.0.0.4:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.HotExecutor _ v9.0.0.9:
+- 跟随 Compiler 升级依赖.
+
+### DotNetCore.Natasha.CSharp.HotExecutor.Wrapper _ v9.0.0.9:
+- 跟随 Compiler 升级依赖.
 
 
 

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -9,19 +9,19 @@
 
 		<When Condition="('$(IsHEProject)' == 'true')">
 
-			<!--<ItemGroup>
+			<ItemGroup>
 				<ProjectReference Include="$(SolutionDir)src\Natasha.CSharp\Extension\HotExecutor\Natasha.CSharp.HotExecutor\Natasha.CSharp.HotExecutor.csproj" />
 				<ProjectReference Include="$(SolutionDir)src\Natasha.CSharp\Component\Core\Natasha.CSharp.Compiler.Domain\Natasha.CSharp.Compiler.Domain.csproj" />
 				<ProjectReference Include="$(SolutionDir)src\Natasha.CSharp\Extension\Natasha.CSharp.Extension.MethodCreator\Natasha.CSharp.Extension.MethodCreator.csproj" />
-			</ItemGroup>-->
+			</ItemGroup>
 
 		</When>
 	</Choose>
 	<Choose>
 		<When Condition="('$(IsHEProject)' == 'true') And ('$(IsHENETCore30)' != 'true')">
-			<!--<ItemGroup>
+			<ItemGroup>
 				<ProjectReference Include="$(SolutionDir)src\Natasha.CSharp\Extension\HotExecutor\Natasha.CSharp.HotExecutor.SG\Natasha.CSharp.HotExecutor.SG.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-			</ItemGroup>-->
+			</ItemGroup>
 		</When>
 	</Choose>
 </Project>
diff --git a/samples/ExtensionSample/Class7.cs b/samples/ExtensionSample/Class7.cs
@@ -1,11 +1,6 @@
 
 //#if DEBUG
-using System.IO;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using Natasha.CSharp.HotExecutor.Utils;
-using Natasha.CSharp.Extension.HotExecutor;
-using ExtensionSample;
 namespace System
 {
 

diff --git a/samples/HE/NET5.0/ConsoleSample/Program.cs b/samples/HE/NET5.0/ConsoleSample/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using Natasha.CSharp.HotExecutor;
+using System;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/samples/HE/NET6.0/WebapiSample/Program.cs b/samples/HE/NET6.0/WebapiSample/Program.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Natasha.CSharp.HotExecutor;
 using System;
 using System.Linq;
 
@@ -107,7 +108,7 @@ public static void Main(string[] args)
                 return forecast;
             })
             .WithName("GetWeatherForecast2");
-
+            HEProxy.AppendArgs();
             app.Run();
             //Once
             //Console.ReadKey();

diff --git a/samples/HE/NET6.0/WebapiSample/WebapiSample.csproj b/samples/HE/NET6.0/WebapiSample/WebapiSample.csproj
@@ -11,11 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+	<!--<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor.Wrapper" Version="9.0.0.6" />-->
   </ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor.Wrapper" Version="9.0.0.6" />
-	</ItemGroup>
-	<ItemGroup>
-	  <PackageReference Update="DotNetCore.Natasha.CSharp.HotExecutor" Version="9.0.0.5" />
-	</ItemGroup>
+
 </Project>
diff --git a/samples/HE/NET8.0/WebapiSample/Program.cs b/samples/HE/NET8.0/WebapiSample/Program.cs
@@ -0,0 +1,38 @@
+
+namespace WebapiSample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+
+            // Add services to the container.
+
+            builder.Services.AddControllers();
+            // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+            builder.Services.AddEndpointsApiExplorer();
+            builder.Services.AddSwaggerGen();
+
+            var app = builder.Build();
+
+            // Configure the HTTP request pipeline.
+            if (app.Environment.IsDevelopment())
+            {
+                app.UseSwagger();
+                app.UseSwaggerUI();
+            }
+
+
+            app.UseHttpsRedirection();
+
+            app.UseAuthorization();
+
+            app.AsyncToHotExecutor();
+            app.MapControllers();
+            app.RunAsync();
+            //Once
+            Console.ReadKey();
+        }
+    }
+}
diff --git a/samples/HE/NET8.0/WebapiSample/WeatherForecast.cs b/samples/HE/NET8.0/WebapiSample/WeatherForecast.cs
@@ -0,0 +1,13 @@
+namespace WebapiSample
+{
+    public class WeatherForecast
+    {
+        public DateOnly Date { get; set; }
+
+        public int TemperatureC { get; set; }
+
+        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+
+        public string? Summary { get; set; }
+    }
+}
diff --git a/samples/HE/NET8.0/WebapiSample/WebapiSample.csproj b/samples/HE/NET8.0/WebapiSample/WebapiSample.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor.Wrapper" Version="9.0.0.4" />
+	</ItemGroup>
+</Project>
diff --git a/samples/HE/NET8.0/WebapiSample/WebapiSample.http b/samples/HE/NET8.0/WebapiSample/WebapiSample.http
@@ -0,0 +1,6 @@
+@WebapiSample_HostAddress = http://localhost:5248
+
+GET {{WebapiSample_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/samples/HE/NETCORE3.0/ConsoleSample/Program.cs b/samples/HE/NETCORE3.0/ConsoleSample/Program.cs
@@ -1,7 +1,6 @@
-using Natasha.CSharp.Extension.HotExecutor;
-using Natasha.CSharp.HotExecutor.Component;
+using Natasha.CSharp.HotExecutor;
+using Natasha.CSharp.HotExecutor.Utils;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Threading;
 

diff --git a/...ha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Natasha.CSharp.Template.Core.csproj b/...ha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Natasha.CSharp.Template.Core.csproj
@@ -7,29 +7,15 @@
 		<PackageTags>Roslyn;Script;Dynamic;Natasha;NMS;Template;</PackageTags>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IsPackable>true</IsPackable>
-		<Version>9.0.0.2</Version>
-		<FileVersion>9.0.0.2</FileVersion>
-		<AssemblyVersion>9.0.0.2</AssemblyVersion>
+		<Version>9.0.0.4</Version>
+		<FileVersion>9.0.0.4</FileVersion>
+		<AssemblyVersion>9.0.0.4</AssemblyVersion>
 	</PropertyGroup>
 	<ItemGroup>
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\netcoreapp3.1\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\netcoreapp3.1\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\netcoreapp3.1\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net5.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net5.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net5.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net6.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net6.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net6.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net7.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net7.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net7.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net8.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net8.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
-		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net8.0\DotNetCore.Natasha.CSharp.Template.Core.targets" />
+	  <ProjectReference Include="..\..\..\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj" />
+	  <Folder Include="Targets\" />
 	</ItemGroup>
 <ItemGroup>
 		<None Include="targets\Project.targets" Pack="true" PackagePath="build\netcoreapp3.1\DotNetCore.Natasha.CSharp.Template.Core.targets" />
@@ -50,3 +36,4 @@
 </ItemGroup>
 </Project>
 
+
diff --git a/...Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Targets/Project.Usings.targets b/...Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Targets/Project.Usings.targets
@@ -0,0 +1,7 @@
+	<ItemGroup Condition="'$(ImplicitUsings)' == 'enable' or '$(ImplicitUsings)' == 'true'">
+		<Using Include="Natasha.CSharp.Template" />
+		<Using Include="Natasha.CSharp.Template.Reverser" />
+		<Using Include="Natasha.CSharp.Builder" />
+		<Using Include="Natasha.CSharp" />
+	</ItemGroup>
+
diff --git a/src/Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Targets/Project.targets b/src/Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Targets/Project.targets
@@ -0,0 +1,11 @@
+<Project>
+	<ItemGroup Condition="'$(ImplicitUsings)' == 'enable' or '$(ImplicitUsings)' == 'true'">
+		<Using Include="Natasha.CSharp.Template" />
+		<Using Include="Natasha.CSharp.Template.Reverser" />
+		<Using Include="Natasha.CSharp.Builder" />
+		<Using Include="Natasha.CSharp" />
+	</ItemGroup>
+
+
+</Project>
+
diff --git a/.../Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/Natasha.CSharp.HotExecutor.SG.csproj b/.../Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/Natasha.CSharp.HotExecutor.SG.csproj
@@ -8,9 +8,9 @@
 		<Description>动态重载控制台代码结果.</Description>
 		<PackageReleaseNotes>升级到最新版.</PackageReleaseNotes>
 		<PackageTags>Natasha;Compiler;Natasha Extension;HotReload;HotExecutor;Source Generator;</PackageTags>
-		<Version>9.0.0.5</Version>
-		<FileVersion>9.0.0.5</FileVersion>
-		<AssemblyVersion>9.0.0.5</AssemblyVersion>
+		<Version>9.0.0.7</Version>
+		<FileVersion>9.0.0.7</FileVersion>
+		<AssemblyVersion>9.0.0.7</AssemblyVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
@@ -25,10 +25,10 @@
 	<ItemGroup>
 		<None Include="$(OutputPath)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
 	</ItemGroup>
-<ItemGroup>
-		<None Include="targets\Project.targets" Pack="true" PackagePath="build\netstandard2.0\DotNetCore.Natasha.CSharp.HotExecutor.SG.targets" />
-		<None Include="targets\Project.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\DotNetCore.Natasha.CSharp.HotExecutor.SG.targets" />
-		<None Include="targets\Project.targets" Pack="true" PackagePath="buildMultiTargeting\netstandard2.0\DotNetCore.Natasha.CSharp.HotExecutor.SG.targets" />
-</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="targets\" />
+	</ItemGroup>
 </Project>
 
+
+
diff --git a/.../HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/Natasha.CSharp.HotExecutor.Wrapper.csproj b/.../HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/Natasha.CSharp.HotExecutor.Wrapper.csproj
@@ -5,9 +5,9 @@
 		<Description>动态重载控制台代码结果.</Description>
 		<PackageReleaseNotes>升级到最新版.</PackageReleaseNotes>
 		<PackageTags>Natasha;Compiler;Natasha Extension;HotReload;HotExecutor;Source Generator;</PackageTags>
-		<Version>9.0.0.7</Version>
-		<FileVersion>9.0.0.7</FileVersion>
-		<AssemblyVersion>9.0.0.7</AssemblyVersion>
+		<Version>9.0.0.9</Version>
+		<FileVersion>9.0.0.9</FileVersion>
+		<AssemblyVersion>9.0.0.9</AssemblyVersion>
 	</PropertyGroup>
 <ItemGroup>
 		<None Include="targets\Project.targets" Pack="true" PackagePath="build\netstandard2.1\DotNetCore.Natasha.CSharp.HotExecutor.Wrapper.targets" />
@@ -17,3 +17,4 @@
 </Project>
 
 
+
diff --git a/...arp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/targets/NugetPackage.targets b/...arp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/targets/NugetPackage.targets
@@ -1,6 +1,6 @@
 <!-- 编辑项目文件，添加指定的 PackageReference 节点 -->
 <ItemGroup>
 	<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor.SG" Version="9.0.0.5" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor" Version="9.0.0.6" />
+	<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor" Version="9.0.0.9" />
 	<PackageReference Include="DotNetCore.Natasha.CSharp.Compiler.Domain" Version="9.0.0.1" />
 </ItemGroup>
diff --git a/...a.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/targets/Project.targets b/...a.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.Wrapper/targets/Project.targets
@@ -0,0 +1,9 @@
+<Project>
+<!-- 编辑项目文件，添加指定的 PackageReference 节点 -->
+<ItemGroup>
+	<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor.SG" Version="9.0.0.5" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+	<PackageReference Include="DotNetCore.Natasha.CSharp.HotExecutor" Version="9.0.0.9" />
+	<PackageReference Include="DotNetCore.Natasha.CSharp.Compiler.Domain" Version="9.0.0.1" />
+</ItemGroup>
+</Project>
+