Add --roll-forward option(nbeauty only), see [Control roll-forwar…

…d behavior](https://learn.microsoft.com/en-us/dotnet/core/versions/selection#control-roll-forward-behavior)
nulastudio · May 22, 2023 · 46d888e · 46d888e
1 parent 8285d66
commit 46d888e
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 16 deletions.
diff --git a/Common/Common.props b/Common/Common.props
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <PackageOutputPath>.nupkg</PackageOutputPath>
-        <Version>2.1.3.0-beta.1</Version>
+        <Version>2.1.3.1</Version>
 
         <Company>nulastudio</Company>
         <Authors>LiesAuer</Authors>

diff --git a/NetBeauty/src/main/beauty.go b/NetBeauty/src/main/beauty.go
@@ -43,6 +43,7 @@ var sharedRuntimeMode = false
 var enableDebug = false
 var usePatch = false
 var isNetFx = false
+var rollForward = ""
 
 var gitcdn string
 var gittree string = ""
@@ -238,7 +239,7 @@ func main() {
 
 				log.LogDetail(fmt.Sprintf("fixing %s", runtimeConfig))
 
-				success := manager.AddStartUpHookToRuntimeConfig(runtimeConfig, startupHook) && manager.FixRuntimeConfig(runtimeConfig, libsDir, uniqieSubDirs, srmMapping, sharedRuntimeMode, usePatch, useWPF)
+				success := manager.AddStartUpHookToRuntimeConfig(runtimeConfig, startupHook) && manager.FixRuntimeConfig(runtimeConfig, libsDir, uniqieSubDirs, srmMapping, sharedRuntimeMode, usePatch, useWPF, rollForward)
 
 				if success {
 					log.LogDetail(fmt.Sprintf("%s fixed", runtimeConfig))
@@ -292,7 +293,8 @@ Info: Log everything.
 	flag.BoolVar(&sharedRuntimeMode, "srmode", false, `[.NET Core App Only] share the runtime between apps`)
 	flag.BoolVar(&enableDebug, "enabledebug", false, `[.NET Core App Only] allow 3rd debuggers(like dnSpy) debugs the app`)
 	flag.BoolVar(&usePatch, "usepatch", false, `[.NET Core App Only] use the patched hostfxr to reduce files`)
-	flag.StringVar(&hiddens, "hiddens", "", `dlls that end users never needed, so hide them`)
+	flag.StringVar(&hiddens, "hiddens", "", `dlls that end users never needed, so hide them.`)
+	flag.StringVar(&rollForward, "roll-forward", "", `override default roll-forward behavior, see https://learn.microsoft.com/en-us/dotnet/core/versions/selection#control-roll-forward-behavior for more details.`)
 
 	flag.Parse()
 
@@ -399,7 +401,7 @@ func exit() {
 
 func usage() {
 	fmt.Println("Usage:")
-	fmt.Println("nbeauty [--loglevel=(Error|Detail|Info)] [--hiddens=hiddenFiles] <beautyDir> [<libsDir> [<excludes>]]")
+	fmt.Println("nbeauty [--loglevel=(Error|Detail|Info)] [--hiddens=hiddenFiles] [--roll-forward=<rollForward>] <beautyDir> [<libsDir> [<excludes>]]")
 	fmt.Println("")
 	fmt.Println("Arguments")
 	fmt.Println("  <excludes>    dlls that no need to be moved, multi-dlls separated with \";\". Example: dll1.dll;lib*;...")

diff --git a/NetBeauty/src/main/bindata.go b/NetBeauty/src/main/bindata.go
diff --git a/NetBeauty/src/manager/manager.go b/NetBeauty/src/manager/manager.go
@@ -322,7 +322,7 @@ func FixExeConfig(exeConfig string, libsDir string) ([]Deps, bool) {
 }
 
 // FixRuntimeConfig 添加libs到runtimeconfig.json
-func FixRuntimeConfig(runtimeConfig string, libsDir string, subDirs []string, srmMapping map[string]string, sharedRuntimeMode bool, usePatch bool, useWPF bool) bool {
+func FixRuntimeConfig(runtimeConfig string, libsDir string, subDirs []string, srmMapping map[string]string, sharedRuntimeMode bool, usePatch bool, useWPF bool, rollForward string) bool {
 	jsonBytes, err := ioutil.ReadFile(runtimeConfig)
 	if err != nil {
 		log.LogError(fmt.Errorf("can not read runtimeconfig.json: %s : %s", runtimeConfig, err.Error()), false)
@@ -486,6 +486,13 @@ func FixRuntimeConfig(runtimeConfig string, libsDir string, subDirs []string, sr
 		runtimeOptions.Set("additionalProbingPaths", resultPaths)
 	}
 
+	if rollForward != "" {
+		json.SetPath([]string{
+			"runtimeOptions",
+			"rollForward",
+		}, rollForward)
+	}
+
 	jsonBytes, _ = json.EncodePretty()
 	if err := ioutil.WriteFile(runtimeConfig, jsonBytes, 0666); err != nil {
 		log.LogError(fmt.Errorf("add NetBeautyLibsDir to runtimeconfig.json failed: %s : %s", runtimeConfig, err.Error()), false)

diff --git a/NetBeauty/src/nbloader/nbloader.dll b/NetBeauty/src/nbloader/nbloader.dll
diff --git a/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj b/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj
@@ -41,7 +41,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/ChromelyTest/ChromelyTest.csproj b/NetBeautyTest/ChromelyTest/ChromelyTest.csproj
@@ -69,7 +69,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/NetFxTest/NetFxTest.csproj b/NetBeautyTest/NetFxTest/NetFxTest.csproj
@@ -146,7 +146,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
     <PackageReference Include="SixLabors.ImageSharp">
       <Version>2.1.3</Version>
     </PackageReference>

diff --git a/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj b/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj
@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj b/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj
@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/WPFTest/WPFTest.csproj b/NetBeautyTest/WPFTest/WPFTest.csproj
@@ -89,7 +89,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/NetBeautyTest/WebAppTest/WebAppTest.csproj b/NetBeautyTest/WebAppTest/WebAppTest.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Your `*.csproj` should be like:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.0-beta.1" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.1" />
   </ItemGroup>
 
 </Project>
@@ -86,7 +86,7 @@ When you run `dotnet build` or `dotnet publish`, everything will be done automat
 ### Use the binary application if your project has already been published.
 ```
 Usage:
-nbeauty2 [--srmode] [--usepatch] [--enabledebug] [--loglevel=(Error|Detail|Info)] [--hiddens=<HiddenFiles>] [--gitcdn=<GitCDN>] [--gittree=<GitTree>] <beautyDir> [<libsDir> [<excludes>]]
+nbeauty2 [--srmode] [--usepatch] [--enabledebug] [--loglevel=(Error|Detail|Info)] [--hiddens=<HiddenFiles>] [--roll-forward=<rollForward>] [--gitcdn=<GitCDN>] [--gittree=<GitTree>] <beautyDir> [<libsDir> [<excludes>]]
 ```
 
 for example