From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../Scripting/Tango.Scripting.Test/App.config | 6 - .../Scripting/Tango.Scripting.Test/App.xaml | 9 -- .../Scripting/Tango.Scripting.Test/App.xaml.cs | 17 --- .../Scripting/Tango.Scripting.Test/MainWindow.xaml | 38 ------ .../Tango.Scripting.Test/MainWindow.xaml.cs | 39 ------ .../Scripting/Tango.Scripting.Test/MainWindowVM.cs | 69 ----------- .../Properties/AssemblyInfo.cs | 55 --------- .../Properties/Resources.Designer.cs | 73 ------------ .../Tango.Scripting.Test/Properties/Resources.resx | 124 ------------------- .../Properties/Settings.Designer.cs | 30 ----- .../Properties/Settings.settings | 7 -- .../Tango.Scripting.Test/Resources/template.csx | 18 --- .../Tango.Scripting.Test.csproj | 132 --------------------- .../Scripting/Tango.Scripting.Test/lib.csx | 13 -- 14 files changed, 630 deletions(-) delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.config delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindowVM.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/AssemblyInfo.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.Designer.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.resx delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.Designer.cs delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.settings delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Resources/template.csx delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/Tango.Scripting.Test.csproj delete mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Test/lib.csx (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Test') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.config b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.config deleted file mode 100644 index 731f6de6c..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml deleted file mode 100644 index 731c7f907..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml.cs deleted file mode 100644 index e1965607a..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace Tango.Scripting.Test -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml deleted file mode 100644 index c1d784f10..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs deleted file mode 100644 index 58a695c10..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Forms; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.Scripting.Editors; - -namespace Tango.Scripting.Test -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - ScriptEditor.LoadingSymbolsProgress += ScriptEditor_AssemblyCacheProgress; - - InitializeComponent(); - DataContext = new MainWindowVM(); - } - - private void ScriptEditor_AssemblyCacheProgress(object sender, Tango.Core.TangoProgressChangedEventArgs e) - { - Debug.WriteLine(e.Progress.ToString()); - } - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindowVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindowVM.cs deleted file mode 100644 index f57de886f..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindowVM.cs +++ /dev/null @@ -1,69 +0,0 @@ -using Microsoft.Win32; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Tango.Core.Commands; -using Tango.Scripting.Basic; -using Tango.SharedUI; - -namespace Tango.Scripting.Test -{ - public class TestContext : IContext - { - - } - - public class MainWindowVM : ViewModel - { - - public RelayCommand AddScriptCommand { get; set; } - public RelayCommand RunCommand { get; set; } - - private Project _project; - public Project Project - { - get { return _project; } - set { _project = value; RaisePropertyChangedAuto(); } - } - - public MainWindowVM() - { - Project = Project.New("untitled"); - Project.Scripts.Add(Script.New("main.csx", Encoding.Default.GetString(Properties.Resources.template), true)); - AddScriptCommand = new RelayCommand(AddScriptFile); - RunCommand = new RelayCommand(RunProject); - } - - private void AddScriptFile() - { - OpenFileDialog dlg = new OpenFileDialog(); - dlg.Filter = "CSharp Script|*.csx"; - if (dlg.ShowDialog().Value) - { - AddScript(dlg.FileName); - } - } - - private void AddScript(String file) - { - Project.Scripts.Add(Script.New(file)); - } - - private async void RunProject() - { - var session = await Project.Run(null); - - session.StateChanged += (x, e) => - { - if (e.State == ProjectSessionState.Completed) - { - MessageBox.Show(e.ReturnValue.ToString()); - } - }; - } - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index f85cc741b..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Tango.Scripting.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tango.Scripting.Test")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.Designer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.Designer.cs deleted file mode 100644 index 3cc3d2906..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.Designer.cs +++ /dev/null @@ -1,73 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.Scripting.Test.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.Scripting.Test.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] template { - get { - object obj = ResourceManager.GetObject("template", resourceCulture); - return ((byte[])(obj)); - } - } - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.resx b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.resx deleted file mode 100644 index 37de48988..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Resources.resx +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\template.csx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.Designer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.Designer.cs deleted file mode 100644 index 05e12ac76..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.Scripting.Test.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.settings b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Resources/template.csx b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Resources/template.csx deleted file mode 100644 index 524b1bb24..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Resources/template.csx +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using Tango.Scripting.Basic; - -public class Program -{ - public object OnExecute(IContext context) - { - - - return new - { - Item1 = "1", - Item2 = "2" - }; - } -} \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Tango.Scripting.Test.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Tango.Scripting.Test.csproj deleted file mode 100644 index 46c6d6453..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/Tango.Scripting.Test.csproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Debug - AnyCPU - {564A30E2-E681-422A-9528-3E8CE301B837} - WinExe - Tango.Scripting.Test - Tango.Scripting.Test - v4.6.1 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - True - True - Resources.resx - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - - Code - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} - Tango.Core - - - {8491d07b-c1f6-4b62-a412-41b9fd2d6538} - Tango.SharedUI - - - {2b29a699-1d65-463a-8250-a2ce81d019c9} - Tango.Scripting.Basic - - - {5812e1c6-abaa-4066-94ac-971c27b4f46a} - Tango.Scripting.Core - - - {da62fa39-668b-47a6-b0f2-d2c1daf777b0} - Tango.Scripting.Editors - - - - - 4.7.0.9 - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/lib.csx b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/lib.csx deleted file mode 100644 index bada6e745..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/lib.csx +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -public class MyClass -{ - public String Do() - { - return "Hi From Lib"; - } -} -- cgit v1.3.1