Added publish script

BitcoderCZ · BitcoderCZ · commit 125d2e479e01 · 2024-10-26T20:32:47.000+02:00
A few tweaks
Changed version
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-.vs/
+.vs/
+
+*.user
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,15 @@
+<Project>
+	<PropertyGroup>
+		<Version>0.0.1</Version>
+		<Authors>Bitcoder</Authors>
+		<RepositoryUrl>https://github.com/BitcoderCZ/FanScript</RepositoryUrl>
+	</PropertyGroup>
+	<PropertyGroup>
+		<TrimMode>partial</TrimMode>
+		<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<DebugSymbols>False</DebugSymbols>
+		<DebugType>None</DebugType>
+	</PropertyGroup>
+</Project>
diff --git a/Dlls/FancadeLoaderLib.Editing.dll b/Dlls/FancadeLoaderLib.Editing.dll
diff --git a/Dlls/FancadeLoaderLib.dll b/Dlls/FancadeLoaderLib.dll
diff --git a/Dlls/MathUtils.dll b/Dlls/MathUtils.dll
diff --git a/Dlls/zlib.net.dll b/Dlls/zlib.net.dll
diff --git a/FanScript.Cli/FanScript.Cli.csproj b/FanScript.Cli/FanScript.Cli.csproj
@@ -5,6 +5,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -17,7 +20,6 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,10 +28,10 @@
 
   <ItemGroup>
     <Reference Include="FancadeLoaderLib">
-      <HintPath>..\FancadeLoaderLib.dll</HintPath>
+      <HintPath>..\Dlls\FancadeLoaderLib.dll</HintPath>
     </Reference>
     <Reference Include="MathUtils">
-      <HintPath>..\MathUtils.dll</HintPath>
+      <HintPath>..\Dlls\MathUtils.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/FanScript.Cli/publish.ps1 b/FanScript.Cli/publish.ps1
@@ -0,0 +1,29 @@
+Param (
+	[Parameter(Mandatory)]
+	[string]$version
+)
+
+$profiles = 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64'
+$publishDir = './bin/Publish'
+
+foreach ($profile in $profiles) {
+	Write-Host "Publishing $profile"
+	dotnet publish -o "$publishDir/$profile/" --sc -c 'Release' -r $profile
+}
+
+Write-Host "Published $($profiles.Count) profile(s)"
+
+New-Item -Path $publishDir -Name "Compressed" -ItemType "directory" -Force
+
+$currentDir = Split-Path -Path (Get-Location) -Leaf
+
+foreach ($profile in $profiles) {
+	$fromDir = "$publishDir/$profile/*"
+	$toFile = "$publishDir/Compressed/$($currentDir)_$($profile)_$version.zip"
+	Write-Host "Comressing $fromDir to $toFile"
+	
+	Compress-Archive -Path $fromDir -CompressionLevel 'Optimal' -DestinationPath $toFile -Force
+}
+
+Write-Host "Compressed builds into archives"
+Write-Host "Done"
diff --git a/FanScript.LangServer/FanScript.LangServer.csproj b/FanScript.LangServer/FanScript.LangServer.csproj
@@ -5,6 +5,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+	
+  <PropertyGroup>
+    <Version>0.0.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/FanScript.LangServer/publish.ps1 b/FanScript.LangServer/publish.ps1
@@ -0,0 +1,29 @@
+Param (
+	[Parameter(Mandatory)]
+	[string]$version
+)
+
+$profiles = 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64'
+$publishDir = './bin/Publish'
+
+foreach ($profile in $profiles) {
+	Write-Host "Publishing $profile"
+	dotnet publish -o "$publishDir/$profile/" --sc -c 'Release' -r $profile
+}
+
+Write-Host "Published $($profiles.Count) profile(s)"
+
+New-Item -Path $publishDir -Name "Compressed" -ItemType "directory" -Force
+
+$currentDir = Split-Path -Path (Get-Location) -Leaf
+
+foreach ($profile in $profiles) {
+	$fromDir = "$publishDir/$profile/*"
+	$toFile = "$publishDir/Compressed/$($currentDir)_$($profile)_$version.zip"
+	Write-Host "Comressing $fromDir to $toFile"
+	
+	Compress-Archive -Path $fromDir -CompressionLevel 'Optimal' -DestinationPath $toFile -Force
+}
+
+Write-Host "Compressed builds into archives"
+Write-Host "Done"
diff --git a/FanScript.Midi/FanScript.Midi.csproj b/FanScript.Midi/FanScript.Midi.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <Reference Include="MathUtils">
-      <HintPath>..\MathUtils.dll</HintPath>
+      <HintPath>..\Dlls\MathUtils.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/FanScript.Tests/FCBlocksTests.cs b/FanScript.Tests/FCBlocksTests.cs
@@ -6,6 +6,7 @@
 using FanScript.FCInfo;
 using MathUtils.Vectors;
 using System.Collections.Frozen;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace FanScript.Tests
@@ -142,7 +143,7 @@ private static IEnumerable<BlockDef> getBlockDefs()
                 Enumerable.Concat(
                     typeof(Blocks).GetFields(bindingFlags),
                     typeof(Blocks).GetNestedTypes(bindingFlags)
-                        .Aggregate(new List<FieldInfo>(), (list, type) =>
+                        .Aggregate(new List<FieldInfo>(), (list, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] type) =>
                         {
                             list.AddRange(type.GetFields(bindingFlags));
                             return list;
diff --git a/FanScript.Tests/FanScript.Tests.csproj b/FanScript.Tests/FanScript.Tests.csproj
@@ -30,10 +30,10 @@
 
   <ItemGroup>
     <Reference Include="FancadeLoaderLib">
-      <HintPath>..\FancadeLoaderLib.dll</HintPath>
+      <HintPath>..\Dlls\FancadeLoaderLib.dll</HintPath>
     </Reference>
     <Reference Include="MathUtils">
-      <HintPath>..\MathUtils.dll</HintPath>
+      <HintPath>..\Dlls\MathUtils.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/FanScript/Compiler/Binding/Rewriters/Lowerer.cs b/FanScript/Compiler/Binding/Rewriters/Lowerer.cs
@@ -362,7 +362,7 @@ private BoundStatement lowerArraySegmentAssignment(BoundArraySegmentExpression e
                         [Variable(node.Syntax, arrayVariable), Literal(node.Syntax, startIndex), expression]
                     ),
                     TypeSymbol.Void,
-                    null,
+                    node.ElementType,
                     null
                 )
             );
diff --git a/FanScript/Compiler/Symbols/BuiltinFunctions.cs b/FanScript/Compiler/Symbols/BuiltinFunctions.cs
@@ -7,12 +7,14 @@
 using FanScript.Utils;
 using MathUtils.Vectors;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("FanScript.DocumentationGenerator")]
 namespace FanScript.Compiler.Symbols
 {
+
     internal static class BuiltinFunctions
     {
         private static Namespace builtinNamespace = new Namespace("builtin");
@@ -23,7 +25,7 @@ static BuiltinFunctions()
         {
             FunctionToDoc = typeof(BuiltinFunctions)
                 .GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Static)
-                .SelectMany(type => type
+                .SelectMany(([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] Type type) => type
                     .GetFields(BindingFlags.Public | BindingFlags.Static)
                     .Where(f => f.FieldType == typeof(FunctionSymbol))
                     .Select(f =>
@@ -91,7 +93,9 @@ private static EmitStore emitAX0(BoundCallExpression call, IEmitContext context,
                         else
                         {
                             Debug.Assert(type.IsValueType);
+#pragma warning disable IL2062 // The parameter of method has a DynamicallyAccessedMembersAttribute, but the value passed to it can not be statically analyzed.
                             val = RuntimeHelpers.GetUninitializedObject(type);
+#pragma warning restore IL2062
                         }
                     }
                     else
@@ -2731,7 +2735,7 @@ public static void Init()
         internal static IEnumerable<FunctionSymbol> GetAll()
             => functionsCache ??= typeof(BuiltinFunctions)
             .GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Static)
-            .SelectMany(type => type
+            .SelectMany(([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] Type type) => type
                 .GetFields(BindingFlags.Public | BindingFlags.Static)
                 .Where(f => f.FieldType == typeof(FunctionSymbol))
                 .Select(f => (FunctionSymbol)f.GetValue(null)!)
diff --git a/FanScript/FanScript.csproj b/FanScript/FanScript.csproj
@@ -7,6 +7,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <FileVersion>$(Version)</FileVersion>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -16,29 +21,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="TextCopy" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="FancadeLoaderLib">
-      <HintPath>..\FancadeLoaderLib.dll</HintPath>
+      <HintPath>..\Dlls\FancadeLoaderLib.dll</HintPath>
     </Reference>
     <Reference Include="FancadeLoaderLib.Editing">
-      <HintPath>..\FancadeLoaderLib.Editing.dll</HintPath>
+      <HintPath>..\Dlls\FancadeLoaderLib.Editing.dll</HintPath>
     </Reference>
     <Reference Include="MathUtils">
-      <HintPath>..\MathUtils.dll</HintPath>
+      <HintPath>..\Dlls\MathUtils.dll</HintPath>
     </Reference>
     <Reference Include="zlib.net">
-      <HintPath>..\zlib.net.dll</HintPath>
+      <HintPath>..\Dlls\zlib.net.dll</HintPath>
     </Reference>
   </ItemGroup>
 
     <ItemGroup>
 		<ProjectReference Include="..\FanScript.Generators\FanScript.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<ProjectReference Include="..\FanScript.Midi\FanScript.Midi.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/README.md b/README.md
@@ -3,8 +3,14 @@ Programming language that compiles into [Fancade](https://www.fancade.com/) bloc
 Compiler based on [Minsk](https://github.com/terrajobst/minsk)  
 Documentation can be found [here](https://github.com/BitcoderCZ/FanScript-Documentation/blob/main/MdDocs/README.md)
 
+## Building
+- Make sure you have installed [dotnet 8 sdk](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- Run `dotnet build -c Release`
+
 ## VSCode Extension
 To run the extension:
+- run `npm install` in the VSCodeExtension folder
+- run `npm install` in the VSCodeExtension/client folder
 - open vscode
 - open folder, select VSCodeExtension
 - in Run and Debug, select "Launch Client" and press F5
diff --git a/VSCodeExtension/client/src/extension.ts b/VSCodeExtension/client/src/extension.ts
@@ -16,7 +16,7 @@ import {
 let client: LanguageClient;
 
 export function activate(context: ExtensionContext) {
-	const serverExecutable = path.join(context.extensionPath, '..\\FanScript.LangServer\\bin\\Debug\\net8.0\\FanScript.LangServer.exe');
+	const serverExecutable = path.join(context.extensionPath, 'FanScript.LangServer.exe');
 
     // Configure the server options to use stdio
     const serverOptions: ServerOptions = {

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -.vs/
 +.vs/
++
 +*.user