From 3956da44b3781852bff7d17baeac5080d812ab30 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 01:10:56 +0100
Subject: [PATCH 01/10] #61: upgrade JCOBridge and version

---
 .github/workflows/maven.yaml           | 2 +-
 .github/workflows/release.yaml         | 2 +-
 src/CLI/JCOReflectorCLI.csproj         | 4 ++--
 src/CLI/JCOReflectorCLI.nuspec         | 2 +-
 src/GUI/JCOReflectorGUI.csproj         | 2 +-
 src/engine/JCOPOMExtension.template    | 2 +-
 src/engine/JCOPOMJCOReflector.template | 2 +-
 src/engine/JCOReflectorEngine.csproj   | 8 ++++----
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 85197a60953..71c07bcc5dd 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -120,7 +120,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.6 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.7 -Dpackaging=jar -DgeneratePom=true
 
       - name: Publish net5.0 to Apache Maven Central
         shell: bash
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a97b3113d91..ef5ee0f0df1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.6 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.7 -Dpackaging=jar -DgeneratePom=true
 
       - name: Publish net5.0 to Apache Maven Central
         shell: bash
diff --git a/src/CLI/JCOReflectorCLI.csproj b/src/CLI/JCOReflectorCLI.csproj
index a04b1639b0e..4e240f6fbfd 100644
--- a/src/CLI/JCOReflectorCLI.csproj
+++ b/src/CLI/JCOReflectorCLI.csproj
@@ -9,7 +9,7 @@
     <Copyright>Copyright ©  MASES s.r.l. 2022</Copyright>
     <Authors>MASES s.r.l.</Authors>
     <Company>MASES s.r.l.</Company>
-    <Version>1.8.6.0</Version>
+    <Version>1.9.0.0</Version>
     <Product>MASES.JCOReflectorCLI</Product>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
@@ -19,7 +19,7 @@
     <PackageProjectUrl>https://github.com/masesgroup/JCOReflector/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/masesgroup/JCOReflector</RepositoryUrl>
     <PackageReleaseNotes>https://github.com/masesgroup/JCOReflector/releases</PackageReleaseNotes>
-    <PackageLicense>LICENSE</PackageLicense>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>JCOB128x128.png</PackageIcon>
     <PackageTags>jcoreflector cli jvm-enabled-language kotlin java scala reflection dotnet clr netcore bridge jcobridge class framework csharp</PackageTags>
     <PackageId>MASES.JCOReflectorCLI</PackageId>
diff --git a/src/CLI/JCOReflectorCLI.nuspec b/src/CLI/JCOReflectorCLI.nuspec
index 0132b74a73e..8ced76853c1 100644
--- a/src/CLI/JCOReflectorCLI.nuspec
+++ b/src/CLI/JCOReflectorCLI.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>MASES.JCOReflectorCLI</id>
-    <version>1.8.6</version>
+    <version>1.9.0</version>
     <title>JCOReflector CLI - CLI interface for JCOReflector Engine</title>
     <authors>MASES s.r.l.</authors>
     <owners>MASES s.r.l.</owners>
diff --git a/src/GUI/JCOReflectorGUI.csproj b/src/GUI/JCOReflectorGUI.csproj
index 6ba6a18d64d..4cfb524c839 100644
--- a/src/GUI/JCOReflectorGUI.csproj
+++ b/src/GUI/JCOReflectorGUI.csproj
@@ -8,7 +8,7 @@
     <Copyright>Copyright ©  MASES s.r.l. 2022</Copyright>
     <Authors>MASES s.r.l.</Authors>
     <Company>MASES s.r.l.</Company>
-    <Version>1.8.6.0</Version>
+    <Version>1.9.0.0</Version>
     <Product>JCOReflectorGUI</Product>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <TargetFrameworks>net461;netcoreapp3.1;net5.0-windows;net6.0-windows</TargetFrameworks>
diff --git a/src/engine/JCOPOMExtension.template b/src/engine/JCOPOMExtension.template
index 45336d870a6..3e8164eba64 100644
--- a/src/engine/JCOPOMExtension.template
+++ b/src/engine/JCOPOMExtension.template
@@ -154,7 +154,7 @@
             <additionalDependency>
               <groupId>JCOBridge</groupId>
               <artifactId>JCOBridge</artifactId>
-              <version>2.4.6</version>
+              <version>2.4.7</version>
             </additionalDependency>
           </additionalDependencies>
         </configuration>
diff --git a/src/engine/JCOPOMJCOReflector.template b/src/engine/JCOPOMJCOReflector.template
index 872af2617c6..b9de629d349 100644
--- a/src/engine/JCOPOMJCOReflector.template
+++ b/src/engine/JCOPOMJCOReflector.template
@@ -166,7 +166,7 @@ POM_SOURCEDIRECTORIES_PLACEHOLDER
             <additionalDependency>
               <groupId>JCOBridge</groupId>
               <artifactId>JCOBridge</artifactId>
-              <version>2.4.6</version>
+              <version>2.4.7</version>
             </additionalDependency>
           </additionalDependencies>
         </configuration>
diff --git a/src/engine/JCOReflectorEngine.csproj b/src/engine/JCOReflectorEngine.csproj
index eecfcb350d8..ef4ce5da68f 100644
--- a/src/engine/JCOReflectorEngine.csproj
+++ b/src/engine/JCOReflectorEngine.csproj
@@ -7,7 +7,7 @@
     <Copyright>Copyright ©  MASES s.r.l. 2022</Copyright>
     <Authors>MASES s.r.l.</Authors>
     <Company>MASES s.r.l.</Company>
-    <Version>1.8.6.0</Version>
+    <Version>1.9.0.0</Version>
     <Product>MASES.JCOReflectorEngine</Product>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
@@ -105,11 +105,11 @@
     <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     <None Include="..\Common\JCOB128x128.png" Pack="true" PackagePath="" />
     <None Include="..\Common\JCOReflector.snk" Link="JCOReflector.snk" />
-    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MASES.CLIParser" Version="2.2.1" />
-    <PackageReference Include="MASES.JCOBridge" Version="2.4.6">
+    <PackageReference Include="MASES.CLIParser" Version="3.0.0" />
+    <PackageReference Include="MASES.JCOBridge" Version="2.4.7">
       <IncludeAssets>All</IncludeAssets>
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>

From 78b506d0670ca2b5ce2afd610df4eb5226a8a979 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 01:11:43 +0100
Subject: [PATCH 02/10] #84: added AvoidDisableInternalNamespace property

---
 src/GUI/AssemblyCollectionControl.xaml    |  2 +-
 src/GUI/AssemblyCollectionControl.xaml.cs | 18 +++++++-------
 src/GUI/MainWindow.xaml                   |  7 +++++-
 src/GUI/MainWindow.xaml.cs                | 23 +++++++++---------
 src/engine/Reflector.cs                   | 29 ++++++++++++-----------
 src/engine/SharedClasses.cs               | 12 ++++++++++
 6 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/GUI/AssemblyCollectionControl.xaml b/src/GUI/AssemblyCollectionControl.xaml
index ab207a25b1c..e35443a6abf 100644
--- a/src/GUI/AssemblyCollectionControl.xaml
+++ b/src/GUI/AssemblyCollectionControl.xaml
@@ -37,7 +37,7 @@
             <Label Content="Total folders" />
             <TextBox Text="{Binding ElementName=assemblyCollectionControl, Path=TotalFolders, Mode=OneWay}" VerticalContentAlignment="Center" IsReadOnly="True"/>
         </DockPanel>
-    <ListView Name="propertyMapping" ItemsSource="{Binding ElementName=assemblyCollectionControl, Path=AssemblyDataCollection, Mode=TwoWay}" 
+        <ListView Name="propertyMapping" ItemsSource="{Binding ElementName=assemblyCollectionControl, Path=AssemblyCollection, Mode=TwoWay}" 
               ScrollViewer.VerticalScrollBarVisibility="Auto" DockPanel.Dock="Bottom">
         <ListView.View>
             <GridView>
diff --git a/src/GUI/AssemblyCollectionControl.xaml.cs b/src/GUI/AssemblyCollectionControl.xaml.cs
index aa8bde0ae57..412153c3c0c 100644
--- a/src/GUI/AssemblyCollectionControl.xaml.cs
+++ b/src/GUI/AssemblyCollectionControl.xaml.cs
@@ -43,15 +43,15 @@ public int TotalFolders
         public static readonly DependencyProperty TotalFoldersProperty =
             DependencyProperty.Register("TotalFolders", typeof(int), typeof(AssemblyCollectionControl), new PropertyMetadata(0));
 
-        public AssemblyDataCollection AssemblyDataCollection
+        public AssemblyDataCollection AssemblyCollection
         {
-            get { return (AssemblyDataCollection)GetValue(AssemblyDataCollectionProperty); }
-            set { SetValue(AssemblyDataCollectionProperty, value); }
+            get { return (AssemblyDataCollection)GetValue(AssemblyCollectionProperty); }
+            set { SetValue(AssemblyCollectionProperty, value); }
         }
 
         // Using a DependencyProperty as the backing store for UserNodeIds.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty AssemblyDataCollectionProperty =
-            DependencyProperty.Register("AssemblyDataCollection", typeof(AssemblyDataCollection), typeof(AssemblyCollectionControl), new PropertyMetadata(PropertyChangedCallback));
+        public static readonly DependencyProperty AssemblyCollectionProperty =
+            DependencyProperty.Register("AssemblyCollection", typeof(AssemblyDataCollection), typeof(AssemblyCollectionControl), new PropertyMetadata(PropertyChangedCallback));
 
         static void PropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
@@ -66,9 +66,9 @@ public AssemblyCollectionControl()
 
         private void btnSelectAll_Click(object sender, RoutedEventArgs e)
         {
-            if (AssemblyDataCollection != null)
+            if (AssemblyCollection != null)
             {
-                foreach (var item in AssemblyDataCollection)
+                foreach (AssemblyData item in AssemblyCollection)
                 {
                     item.IsSelected = true;
                 }
@@ -77,9 +77,9 @@ private void btnSelectAll_Click(object sender, RoutedEventArgs e)
 
         private void btnUnselectAll_Click(object sender, RoutedEventArgs e)
         {
-            if (AssemblyDataCollection != null)
+            if (AssemblyCollection != null)
             {
-                foreach (var item in AssemblyDataCollection)
+                foreach (AssemblyData item in AssemblyCollection)
                 {
                     item.IsSelected = false;
                 }
diff --git a/src/GUI/MainWindow.xaml b/src/GUI/MainWindow.xaml
index 8ef4265fbd3..b331b845b03 100644
--- a/src/GUI/MainWindow.xaml
+++ b/src/GUI/MainWindow.xaml
@@ -88,6 +88,11 @@
                                             <CheckBox Name="cbEnableRefOutParameters" Content="Ref Out Parameters" IsChecked="False" VerticalContentAlignment="Center" ToolTip="Enable RefOut Parameters"/>
                                         </DockPanel>
                                     </GroupBox>
+                                    <GroupBox DockPanel.Dock="Top" Header="Namespace">
+                                        <DockPanel  Height="30">
+                                            <CheckBox Name="cbAvoidDisableInternalNamespace" Content="Reflect namepsace with Internal" IsChecked="False" VerticalContentAlignment="Center" ToolTip="Set to true to disable avoidance of reflection of namespaces ending with Internal"/>
+                                        </DockPanel>
+                                    </GroupBox>
                                 </DockPanel>
                             </GroupBox>
                             <DockPanel DockPanel.Dock="Top" MinHeight="30" LastChildFill="False">
@@ -132,7 +137,7 @@
                             <Label Content="External POM Filename" VerticalContentAlignment="Center" VerticalAlignment="Stretch"/>
                             <TextBox Name="tbPOMFileName" VerticalContentAlignment="Center" VerticalAlignment="Stretch" />
                         </DockPanel>
-                        <local:AssemblyCollectionControl DockPanel.Dock="Bottom" AssemblyDataCollection="{Binding ElementName=mainWindow, Path=AssemblyDataCollection, Mode=TwoWay}"/>
+                        <local:AssemblyCollectionControl DockPanel.Dock="Bottom" AssemblyCollection="{Binding ElementName=mainWindow, Path=AssemblyCollection, Mode=TwoWay}"/>
                     </DockPanel>
                 </TabItem>
             </TabControl>
diff --git a/src/GUI/MainWindow.xaml.cs b/src/GUI/MainWindow.xaml.cs
index 186aa067013..85285c0a23a 100644
--- a/src/GUI/MainWindow.xaml.cs
+++ b/src/GUI/MainWindow.xaml.cs
@@ -55,15 +55,15 @@ public string JarDestinationFolder
         public static readonly DependencyProperty JarDestinationFolderProperty =
             DependencyProperty.Register("JarDestinationFolder", typeof(string), typeof(MainWindow), new PropertyMetadata(JobManager.JarDestinationFolder));
 
-        public AssemblyDataCollection AssemblyDataCollection
+        public AssemblyDataCollection AssemblyCollection
         {
-            get { return (AssemblyDataCollection)GetValue(AssemblyDataCollectionProperty); }
-            set { SetValue(AssemblyDataCollectionProperty, value); }
+            get { return (AssemblyDataCollection)GetValue(AssemblyCollectionProperty); }
+            set { SetValue(AssemblyCollectionProperty, value); }
         }
 
         // Using a DependencyProperty as the backing store for UserNodeIds.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty AssemblyDataCollectionProperty =
-            DependencyProperty.Register("AssemblyDataCollection", typeof(AssemblyDataCollection), typeof(MainWindow));
+        public static readonly DependencyProperty AssemblyCollectionProperty =
+            DependencyProperty.Register("AssemblyCollection", typeof(AssemblyDataCollection), typeof(MainWindow));
 
         public int MaxDepth
         {
@@ -173,6 +173,7 @@ private void btnExecute_Click(object sender, RoutedEventArgs e)
                 EnableInheritance = cbEnableInheritance.IsChecked.Value,
                 EnableInterfaceInheritance = cbEnableInterfaceInheritance.IsChecked.Value,
                 EnableRefOutParameters = cbEnableRefOutParameters.IsChecked.Value,
+                AvoidDisableInternalNamespace = cbAvoidDisableInternalNamespace.IsChecked.Value,
                 DryRun = cbDryRun.IsChecked.Value
             };
 
@@ -202,7 +203,7 @@ private void btnGetFolders_Click(object sender, RoutedEventArgs e)
 
             var result = JobManager.CreateFolderList(args);
 
-            AssemblyDataCollection = result;
+            AssemblyCollection = result;
         }
 
         private void btnBuild_Click(object sender, RoutedEventArgs e)
@@ -217,7 +218,7 @@ private void btnBuild_Click(object sender, RoutedEventArgs e)
                     JDKToolExtraOptions = tbJDKToolExtraOptions.Text,
                     SourceFolder = SourceDestinationFolder,
                     SplitFolderByAssembly = cbEnableSplitFolder.IsChecked.Value,
-                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyDataCollection)
+                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyCollection)
                 };
 
                 if (cbExportToFile.IsChecked.Value)
@@ -248,7 +249,7 @@ private void btnBuildDoc_Click(object sender, RoutedEventArgs e)
                     JDKToolExtraOptions = tbJDKToolExtraOptions.Text,
                     SourceFolder = SourceDestinationFolder,
                     SplitFolderByAssembly = cbEnableSplitFolder.IsChecked.Value,
-                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyDataCollection),
+                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyCollection),
                     CommitVersion = tbCommitVersion.Text
                 };
 
@@ -283,7 +284,7 @@ private void btnCreateJars_Click(object sender, RoutedEventArgs e)
                     WithJARSource = cbWithSource.IsChecked.Value,
                     EmbeddingJCOBridge = cbWithEmbedding.IsChecked.Value,
 
-                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyDataCollection)
+                    AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyCollection)
                 };
 
                 if (cbExportToFile.IsChecked.Value)
@@ -311,7 +312,7 @@ private void btnGenerateSnapshotPOM_Click(object sender, RoutedEventArgs e)
                 JDKToolExtraOptions = tbJDKToolExtraOptions.Text,
                 SourceFolder = SourceDestinationFolder,
                 SplitFolderByAssembly = cbEnableSplitFolder.IsChecked.Value,
-                AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyDataCollection)
+                AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyCollection)
             };
 
             if (cbExportToFile.IsChecked.Value)
@@ -335,7 +336,7 @@ private void btnGeneratePOM_Click(object sender, RoutedEventArgs e)
                 SourceFolder = SourceDestinationFolder,
                 SplitFolderByAssembly = cbEnableSplitFolder.IsChecked.Value,
                 POMStagingType = POMStagingType.Release,
-                AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyDataCollection)
+                AssembliesToUse = AssemblyDataCollection.CreateList(AssemblyCollection)
             };
 
             if (cbExportToFile.IsChecked.Value)
diff --git a/src/engine/Reflector.cs b/src/engine/Reflector.cs
index b6afa5b69c7..5d4913929ad 100644
--- a/src/engine/Reflector.cs
+++ b/src/engine/Reflector.cs
@@ -56,6 +56,7 @@ static class Reflector
         static bool AvoidHierarchyTraversing;
         static bool CreateExceptionThrownClause;
         static int ExceptionThrownClauseDepth;
+        static bool AvoidDisableInternalNamespace;
 
         static long loadedAssemblies = 0;
         static long parsedAssemblies = 0;
@@ -85,7 +86,7 @@ static class Reflector
 
         static string reflectorVersion = typeof(Reflector).Assembly.GetName().Version.ToString();
 
-        static string replaceSinglekeyword(string inputName)
+        static string ReplaceSinglekeyword(string inputName)
         {
             foreach (var item in Const.KeyWords)
             {
@@ -302,7 +303,7 @@ static string GetReport(string[] assemblyNames)
             return res;
         }
 
-        static void writeExtraClasses(ReflectorEventArgs args)
+        static void WriteExtraClasses(ReflectorEventArgs args)
         {
             string destFolder = assemblyDestinationFolder(SourceDestinationFolder, new AssemblyName(Const.SpecialNames.JCOReflectorGeneratedFolder), SplitByAssembly);
             var jcoBridgeOptionsFile = Path.Combine(destFolder, Const.FileNameAndDirectory.OrgSubDirectory,
@@ -367,11 +368,11 @@ public static async Task ExecuteAction(object o)
             EnableInterfaceInheritance = args.EnableInterfaceInheritance;
             EnableRefOutParameters = args.EnableRefOutParameters;
             EnableWrite = !args.DryRun;
+            AvoidDisableInternalNamespace = args.AvoidDisableInternalNamespace;
 
-            writeExtraClasses(args);
+            WriteExtraClasses(args);
 
             string reportStr = string.Empty;
-            string statisticsCsv = string.Empty;
             try
             {
                 foreach (var item in args.AssemblyNames)
@@ -412,7 +413,7 @@ public static async Task ExecuteAction(object o)
                     }
 
                     string statisticsError;
-                    statisticsCsv = GetStatisticsCsv(out statisticsError);
+                    string statisticsCsv = GetStatisticsCsv(out statisticsError);
 
                     if (!String.IsNullOrEmpty(statisticsError))
                     {
@@ -470,11 +471,11 @@ static string assemblyDestinationFolder(string rootFolder, AssemblyName assembly
             return Path.Combine(rootFolder, Const.Framework.RuntimeFolder, splitByAssembly ? assemblyName.ToFolderName() : string.Empty);
         }
 
-        static bool typePrefilter(Type type)
+        static bool TypePrefilter(this Type type)
         {
             if (type.IsPublic
                 && !type.IsGenericType
-                && !type.ToPackageName().Contains(Const.SpecialNames.Internal) // avoid types with internal namespace name which are public
+                && (AvoidDisableInternalNamespace || !type.ToPackageName().Contains(Const.SpecialNames.Internal)) // avoid types with internal namespace name which are public
                )
             {
                 return true;
@@ -554,7 +555,7 @@ public static Assembly ExportAssembly(IList<string> assemblyReferenced, IList<st
 
                 var typeName = item.FullName;
 
-                if (typePrefilter(item))
+                if (item.TypePrefilter())
                 {
                     JobManager.AppendToConsole(LogLevel.Verbose, "Store {0} within types to be exported", item.AssemblyQualifiedName);
                     typesToExport.Add(item);
@@ -565,7 +566,7 @@ public static Assembly ExportAssembly(IList<string> assemblyReferenced, IList<st
                     Interlocked.Increment(ref discardedTypes);
                     if (!item.IsPublic) Interlocked.Increment(ref discardedNonPublicTypes);
                     else if (item.IsGenericType) Interlocked.Increment(ref discardedGenericTypes);
-                    else if (item.ToPackageName().Contains(Const.SpecialNames.Internal)) Interlocked.Increment(ref discardedInternalTypes);
+                    else if (AvoidDisableInternalNamespace || item.ToPackageName().Contains(Const.SpecialNames.Internal)) Interlocked.Increment(ref discardedInternalTypes);
                 }
             }
 
@@ -1105,7 +1106,7 @@ static string ExportConstructors(this Type type, IList<Type> imports, bool withI
                     string paramType = convertType(imports, parameter.ParameterType, out isPrimitive, out defaultPrimitiveValue, out isManaged, out isSpecial, out isArray);
                     if (!isManaged) break; // found not managed type, stop here
 
-                    var paramName = replaceSinglekeyword(parameter.Name);
+                    var paramName = ReplaceSinglekeyword(parameter.Name);
                     isPrimitive |= typeof(Delegate).IsAssignableFrom(parameter.ParameterType);
                     ctorParams.Append(string.Format(Const.Parameters.INPUT_PARAMETER, (isArray) ? paramType + (IsParams(parameter) ? Const.SpecialNames.VarArgsTrailer : Const.SpecialNames.ArrayTrailer) : paramType, paramName));
 
@@ -1514,7 +1515,7 @@ static string ExportMethods(this Type type, IList<Type> imports, IList<Type> imp
                             isPrimitive |= typeof(Delegate).IsAssignableFrom(parameter.ParameterType);
                             string formatter = string.Empty;
                             string objectCaster = string.Empty;
-                            var paramName = replaceSinglekeyword(parameter.Name);
+                            var paramName = ReplaceSinglekeyword(parameter.Name);
                             if (useRefOut)
                             {
                                 string primitiveParam = Const.Parameters.JCORefOutType;
@@ -1840,7 +1841,7 @@ static string ExportMethods(this Type type, IList<Type> imports, IList<Type> imp
                                 isPrimitive |= typeof(Delegate).IsAssignableFrom(parameter.ParameterType);
                                 string formatter = string.Empty;
                                 string objectCaster = string.Empty;
-                                var paramName = replaceSinglekeyword(parameter.Name);
+                                var paramName = ReplaceSinglekeyword(parameter.Name);
                                 if (useRefOut)
                                 {
                                     string primitiveParam = Const.Parameters.JCORefOutType;
@@ -1986,7 +1987,7 @@ static string buildPropertySignature(string templateToUse, string propertyJavaNa
             StringBuilder inputParams = new StringBuilder();
             StringBuilder execParams = new StringBuilder();
 
-            propertyJavaName = replaceSinglekeyword(propertyJavaName);
+            propertyJavaName = ReplaceSinglekeyword(propertyJavaName);
 
             string inputParamStr = inputParams.ToString();
             if (!string.IsNullOrEmpty(inputParamStr))
@@ -2424,7 +2425,7 @@ static bool ExportingDelegate(this Type item, string destFolder, string assembly
                 }
                 if (!isManaged) break; // found not managed type, stop here
 
-                var paramName = replaceSinglekeyword(parameter.Name);
+                var paramName = ReplaceSinglekeyword(parameter.Name);
 
                 if (isArray)
                 {
diff --git a/src/engine/SharedClasses.cs b/src/engine/SharedClasses.cs
index 934b4c31e1a..88e2c84e7e6 100644
--- a/src/engine/SharedClasses.cs
+++ b/src/engine/SharedClasses.cs
@@ -228,6 +228,7 @@ public class CmdParam
             public const string EnableRefOutParameters = "EnableRefOutParameters";
             public const string DryRun = "DryRun";
             public const string AvoidReportAndStatistics = "AvoidReportAndStatistics";
+            public const string AvoidDisableInternalNamespace = "AvoidDisableInternalNamespace";
 
             // JavaBuilderEventArgs
             public const string JDKFolder = "JDKFolder";
@@ -397,6 +398,12 @@ static IArgumentMetadata[] prepareArguments()
                     Default = false,
                     Help = "Do not write report and statistics (used from JobType.Reflect).",
                 },
+                new ArgumentMetadata<bool>()
+                {
+                    Name = CmdParam.AvoidDisableInternalNamespace,
+                    Default = false,
+                    Help = "Do not bypass namespace ending with Internal.",
+                },
                 new ArgumentMetadata<string>()
                 {
                     Name = CmdParam.JDKFolder,
@@ -657,6 +664,10 @@ public static CommonEventArgs UpdateFromArgs(this CommonEventArgs arg, IEnumerab
                         {
                             newArg.AvoidReportAndStatistics = Parser.Get<bool>(args, CmdParam.AvoidReportAndStatistics);
                         }
+                        if (Parser.Exist(args, CmdParam.AvoidDisableInternalNamespace))
+                        {
+                            newArg.AvoidDisableInternalNamespace = Parser.Get<bool>(args, CmdParam.AvoidDisableInternalNamespace);
+                        }
                     }
                     break;
                 case JobTypes.Build:
@@ -1612,6 +1623,7 @@ public ReflectorEventArgs(LogLevel logLevel)
         public bool EnableRefOutParameters { get; set; }
         public bool DryRun { get; set; }
         public bool AvoidReportAndStatistics { get; set; }
+        public bool AvoidDisableInternalNamespace { get; set; }
     }
     #endregion
 }

From f98367ef262713de57847c6f9b0e6e79e8c47572 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 01:13:30 +0100
Subject: [PATCH 03/10] #83: license is available in the package

---
 src/engine/JCOReflectorEngine.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine/JCOReflectorEngine.csproj b/src/engine/JCOReflectorEngine.csproj
index ef4ce5da68f..9ab28081a72 100644
--- a/src/engine/JCOReflectorEngine.csproj
+++ b/src/engine/JCOReflectorEngine.csproj
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/masesgroup/JCOReflector/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/masesgroup/JCOReflector</RepositoryUrl>
     <PackageReleaseNotes>https://github.com/masesgroup/JCOReflector/releases</PackageReleaseNotes>
-    <PackageLicense>LICENSE</PackageLicense>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>JCOB128x128.png</PackageIcon>
     <PackageTags>jcoreflector jvm-enabled-language kotlin java scala reflection dotnet clr netcore bridge jcobridge class framework csharp</PackageTags>
     <PackageId>MASES.JCOReflectorEngine</PackageId>

From a1096b05b1cb63f9eac5cf42ad1ce00e2b9c3569 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:36:41 +0100
Subject: [PATCH 04/10] Test now runs with a license

---
 .github/workflows/GetLicense.ps1  | 2 ++
 .github/workflows/SaveLicense.ps1 | 6 ++++++
 .github/workflows/linux.yaml      | 4 ++++
 .github/workflows/windows.yaml    | 5 ++++-
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/GetLicense.ps1
 create mode 100644 .github/workflows/SaveLicense.ps1

diff --git a/.github/workflows/GetLicense.ps1 b/.github/workflows/GetLicense.ps1
new file mode 100644
index 00000000000..ba5218f6cf6
--- /dev/null
+++ b/.github/workflows/GetLicense.ps1
@@ -0,0 +1,2 @@
+$bytes = [Convert]::FromBase64String($args[0])
+[IO.File]::WriteAllBytes($args[1], $bytes)
\ No newline at end of file
diff --git a/.github/workflows/SaveLicense.ps1 b/.github/workflows/SaveLicense.ps1
new file mode 100644
index 00000000000..d3dcedc282b
--- /dev/null
+++ b/.github/workflows/SaveLicense.ps1
@@ -0,0 +1,6 @@
+[Console]::WriteLine("Reading {0}, writing {1}", $args[0], $args[1])
+$bytes = [IO.File]::ReadAllBytes($args[0])
+[Console]::WriteLine("Read {0} bytes from {1}", $bytes.Length, $args[0])
+$b64 = [Convert]::ToBase64String($bytes)
+[Console]::WriteLine("Writing {0} with length {1} on {2}", $b64, $b64.Length, $args[1])
+[IO.File]::WriteAllText($args[1], [Convert]::ToBase64String($bytes))
\ No newline at end of file
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 8cf389fccd6..43c5774ffb7 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -69,6 +69,10 @@ jobs:
           with: 
             fetch-depth: '1'
 
+        - name: Extract file
+          run: .github/workflows/GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } ./JCOBridge.lic
+          shell: pwsh
+
         # Install .NET SDKs
         - name: Setup .NET Core 3.1
           uses: actions/setup-dotnet@v1
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index e6ea289dff7..c3e6c7aaa44 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -71,6 +71,9 @@ jobs:
         with: 
           fetch-depth: '1'
 
+      - name: Extract file
+        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
+
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\JCOReflectorCLI.sln
@@ -142,7 +145,7 @@ jobs:
       - name: Build Java test source file .NET Core 3.1
         run: javac -cp ./bin/netcoreapp3.1/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java
 
-      - run: java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App       
+      - run: java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
       - run: java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNET --CoreCLRApp:Microsoft.NETCore.App
       - run: java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
       - run: java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App

From ba551f191ad99d4bc546a48c3e8ccf4fcf3f5350 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:53:38 +0100
Subject: [PATCH 05/10] Trigger

---
 .github/workflows/windows.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index c3e6c7aaa44..5416a0a80ca 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -71,7 +71,7 @@ jobs:
         with: 
           fetch-depth: '1'
 
-      - name: Extract file
+      - name: Extract secret
         run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell

From 18ab6b66a5a044a035cbbd0e9e34709fe6227e68 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:55:45 +0100
Subject: [PATCH 06/10] Update missing workflows/testbranch.yaml

---
 .github/workflows/testbranch.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.yaml
index bdb66b0d2e4..9985ebe6270 100644
--- a/.github/workflows/testbranch.yaml
+++ b/.github/workflows/testbranch.yaml
@@ -76,6 +76,9 @@ jobs:
       - name: Export environment variables
         run: set
         shell: cmd
+        
+      - name: Extract secret
+        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI

From 746ca10ad3aac065898a193ab00e21d649b06c98 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:57:07 +0100
Subject: [PATCH 07/10] Update workflows/pullrequests.yaml

---
 .github/workflows/pullrequests.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/pullrequests.yaml b/.github/workflows/pullrequests.yaml
index 73e9913156b..e1f501792be 100644
--- a/.github/workflows/pullrequests.yaml
+++ b/.github/workflows/pullrequests.yaml
@@ -70,6 +70,9 @@ jobs:
       - uses: actions/checkout@v2
         with: 
           fetch-depth: '1'
+          
+      - name: Extract secret
+        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI

From 19e05992a449de2e4588aca17d54ffc49a31e139 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:58:46 +0100
Subject: [PATCH 08/10] Fix workflows

---
 .github/workflows/linux.yaml        | 2 +-
 .github/workflows/pullrequests.yaml | 2 +-
 .github/workflows/testbranch.yaml   | 2 +-
 .github/workflows/windows.yaml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 43c5774ffb7..20f7cff638f 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -70,7 +70,7 @@ jobs:
             fetch-depth: '1'
 
         - name: Extract file
-          run: .github/workflows/GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } ./JCOBridge.lic
+          run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} ./JCOBridge.lic
           shell: pwsh
 
         # Install .NET SDKs
diff --git a/.github/workflows/pullrequests.yaml b/.github/workflows/pullrequests.yaml
index e1f501792be..23caf0fba8d 100644
--- a/.github/workflows/pullrequests.yaml
+++ b/.github/workflows/pullrequests.yaml
@@ -72,7 +72,7 @@ jobs:
           fetch-depth: '1'
           
       - name: Extract secret
-        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
+        run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI
diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.yaml
index 9985ebe6270..9c98908bbbc 100644
--- a/.github/workflows/testbranch.yaml
+++ b/.github/workflows/testbranch.yaml
@@ -78,7 +78,7 @@ jobs:
         shell: cmd
         
       - name: Extract secret
-        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
+        run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 5416a0a80ca..225658b2cb4 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -72,7 +72,7 @@ jobs:
           fetch-depth: '1'
 
       - name: Extract secret
-        run: .github\workflows\GetLicense.ps1 ${ { secrets.JCOBRIDGE_247 } } .\JCOBridge.lic
+        run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI

From 52ce6b659d9405932d3352beaff7ed9cc505b1d3 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 03:37:01 +0100
Subject: [PATCH 09/10] Retest for wrong license position

---
 .github/workflows/testbranch.yaml | 81 ++++++++++++++++---------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.yaml
index 9c98908bbbc..1b772e1a025 100644
--- a/.github/workflows/testbranch.yaml
+++ b/.github/workflows/testbranch.yaml
@@ -213,29 +213,30 @@ jobs:
       - name: Build Scala test source file .NET Core 3.1
         shell: cmd
         run: |
+          copy .\JCOBridge.lic ./netreflected-tests/scala/
           cd ./netreflected-tests/scala
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/netcoreapp3.1/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
 
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd
@@ -247,25 +248,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net5.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -277,25 +278,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net6.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -307,25 +308,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net461/*" -d ./output ./src/main/scala/hierarchy/*.scala ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
              
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd  

From d972f875dbf9b306e87ecaf1f083cfc8fb2c7e1b Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 10 Mar 2022 03:40:40 +0100
Subject: [PATCH 10/10] Updates all files to use license

---
 .github/workflows/pullrequests.yaml | 81 ++++++++++++++--------------
 .github/workflows/testbranch.yaml   |  1 -
 .github/workflows/windows.yaml      | 84 ++++++++++++++---------------
 3 files changed, 82 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/pullrequests.yaml b/.github/workflows/pullrequests.yaml
index 23caf0fba8d..270b76d14fc 100644
--- a/.github/workflows/pullrequests.yaml
+++ b/.github/workflows/pullrequests.yaml
@@ -214,25 +214,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/netcoreapp3.1/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
 
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd
@@ -244,25 +244,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net5.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -274,25 +274,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net6.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -304,26 +304,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net461/*" -d ./output ./src/main/scala/hierarchy/*.scala ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
              
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd  
-        
\ No newline at end of file
diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.yaml
index 1b772e1a025..7b1d1df43e6 100644
--- a/.github/workflows/testbranch.yaml
+++ b/.github/workflows/testbranch.yaml
@@ -213,7 +213,6 @@ jobs:
       - name: Build Scala test source file .NET Core 3.1
         shell: cmd
         run: |
-          copy .\JCOBridge.lic ./netreflected-tests/scala/
           cd ./netreflected-tests/scala
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/netcoreapp3.1/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 225658b2cb4..6e72b97a2be 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -211,25 +211,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/netcoreapp3.1/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
 
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd
@@ -241,25 +241,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net5.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -271,29 +271,29 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net6.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
-   
+
       - name: Build Scala test source file .NET Framework
         shell: cmd
         run: |
@@ -301,29 +301,29 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net461/*" -d ./output ./src/main/scala/hierarchy/*.scala ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
              
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd  
-        
+
       - name: Compress release files
         run: | 
           Compress-Archive -Path .\bin\netcoreapp3.1\* -DestinationPath .\bin\netcoreapp3.1.zip