diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..75f4d10 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + net46 + 1910.1.3 + + diff --git a/GeekOut2018.EnovaAutonomousExtension/GeekOut2018.EnovaUnitTestExtension.csproj b/GeekOut2018.EnovaAutonomousExtension/GeekOut2018.EnovaUnitTestExtension.csproj index 1a1688e..b1010ee 100644 --- a/GeekOut2018.EnovaAutonomousExtension/GeekOut2018.EnovaUnitTestExtension.csproj +++ b/GeekOut2018.EnovaAutonomousExtension/GeekOut2018.EnovaUnitTestExtension.csproj @@ -1,63 +1,7 @@  - - - + - Debug - AnyCPU - {8372DECB-E2D0-46E1-98E2-42527F5409A9} - Library - Properties - GeekOut2018.EnovaUnitTestExtension - GeekOut2018.EnovaUnitTestExtension - v4.0 - 512 + $(SonetaTargetFramework) + true - - $(ExtensionOtput) - - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - - $(SonetaBinaries)Soneta.Business.dll - False - - - $(SonetaBinaries)Soneta.Handel.dll - False - - - $(SonetaBinaries)Soneta.Types.dll - False - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/GeekOut2018.EnovaAutonomousExtension/Properties/AssemblyInfo.cs b/GeekOut2018.EnovaAutonomousExtension/Properties/AssemblyInfo.cs deleted file mode 100644 index 2d89716..0000000 --- a/GeekOut2018.EnovaAutonomousExtension/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.EnovaUnitTestExtension")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.EnovaExtension")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94efeb3d-ad26-4b90-b905-75541030c5c9")] - -// 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/GeekOut2018.EnovaExtension.Tests/App.config b/GeekOut2018.EnovaExtension.Tests/App.config deleted file mode 100644 index 1812839..0000000 --- a/GeekOut2018.EnovaExtension.Tests/App.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GeekOut2018.EnovaExtension.Tests/GeekOut2018.EnovaExtension.Tests.csproj b/GeekOut2018.EnovaExtension.Tests/GeekOut2018.EnovaExtension.Tests.csproj index f00599b..bb2c849 100644 --- a/GeekOut2018.EnovaExtension.Tests/GeekOut2018.EnovaExtension.Tests.csproj +++ b/GeekOut2018.EnovaExtension.Tests/GeekOut2018.EnovaExtension.Tests.csproj @@ -1,84 +1,9 @@  - - - + - Debug - AnyCPU - {65C814D0-51E7-4AC7-8569-3EA25019CA86} - Library - Properties - GeekOut2018.EnovaExtension.Tests - GeekOut2018.EnovaExtension.Tests - v4.0 - 512 + $(SonetaTargetFramework) - - $(SonetaBinaries) - - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - - true - - - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll - - - $(SonetaBinaries)Soneta.Business.dll - False - - - $(SonetaBinaries)Soneta.Core.dll - False - - - $(SonetaBinaries)Soneta.Handel.dll - False - - - $(SonetaBinaries)Soneta.Types.dll - False - - - - - - - - - - - - - - - - - - - - {94efeb3d-ad26-4b90-b905-75541030c5c9} - GeekOut2018.EnovaExtension - True - - - + - - \ No newline at end of file + diff --git a/GeekOut2018.EnovaExtension.Tests/Properties/AssemblyInfo.cs b/GeekOut2018.EnovaExtension.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 64880f2..0000000 --- a/GeekOut2018.EnovaExtension.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.EnovaExtension.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.EnovaExtension.Tests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("65c814d0-51e7-4ac7-8569-3ea25019ca86")] - -// 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/GeekOut2018.EnovaExtension.Tests/ZmianaNazwTowarowWorkerTests.cs b/GeekOut2018.EnovaExtension.Tests/ZmianaNazwTowarowWorkerTests.cs index 999dfa6..008cb77 100644 --- a/GeekOut2018.EnovaExtension.Tests/ZmianaNazwTowarowWorkerTests.cs +++ b/GeekOut2018.EnovaExtension.Tests/ZmianaNazwTowarowWorkerTests.cs @@ -1,6 +1,6 @@ using System; using NUnit.Framework; -using Soneta.Test.Poligon; +using Soneta.Test; using Soneta.Towary; namespace GeekOut2018.EnovaExtension.Tests diff --git a/GeekOut2018.EnovaExtension.Tests/packages.config b/GeekOut2018.EnovaExtension.Tests/packages.config deleted file mode 100644 index 116d50c..0000000 --- a/GeekOut2018.EnovaExtension.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GeekOut2018.EnovaExtension/GeekOut2018.EnovaExtension.csproj b/GeekOut2018.EnovaExtension/GeekOut2018.EnovaExtension.csproj index 367008f..b1010ee 100644 --- a/GeekOut2018.EnovaExtension/GeekOut2018.EnovaExtension.csproj +++ b/GeekOut2018.EnovaExtension/GeekOut2018.EnovaExtension.csproj @@ -1,64 +1,7 @@  - - - + - Debug - AnyCPU - {94EFEB3D-AD26-4B90-B905-75541030C5C9} - Library - Properties - GeekOut2018.EnovaExtension - GeekOut2018.EnovaExtension - v4.0 - 512 + $(SonetaTargetFramework) + true - - $(ExtensionOtput) - - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - - $(SonetaBinaries)Soneta.Business.dll - False - - - $(SonetaBinaries)Soneta.Core.dll - False - - - $(SonetaBinaries)Soneta.Handel.dll - False - - - $(SonetaBinaries)Soneta.Types.dll - False - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/GeekOut2018.EnovaExtension/Properties/AssemblyInfo.cs b/GeekOut2018.EnovaExtension/Properties/AssemblyInfo.cs deleted file mode 100644 index bf78816..0000000 --- a/GeekOut2018.EnovaExtension/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.EnovaExtension")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.EnovaExtension")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94efeb3d-ad26-4b90-b905-75541030c5c9")] - -// 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/GeekOut2018.EnovaUnitTestExtension.Tests/GeekOut2018.EnovaUnitTestExtension.Tests.csproj b/GeekOut2018.EnovaUnitTestExtension.Tests/GeekOut2018.EnovaUnitTestExtension.Tests.csproj index 4c83e46..4ed1cb9 100644 --- a/GeekOut2018.EnovaUnitTestExtension.Tests/GeekOut2018.EnovaUnitTestExtension.Tests.csproj +++ b/GeekOut2018.EnovaUnitTestExtension.Tests/GeekOut2018.EnovaUnitTestExtension.Tests.csproj @@ -1,81 +1,11 @@  - - - + - Debug - AnyCPU - {4F26CA80-4BE8-47D9-A114-C7B4544DE353} - Library - GeekOut2018.EnovaUnitTestExtension.Tests - GeekOut2018.EnovaUnitTestExtension.Tests - v4.0 - 512 + $(SonetaTargetFramework) + true - - $(SonetaBinaries) - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll - - - $(SonetaBinaries)Soneta.Business.dll - True - - - $(SonetaBinaries)Soneta.Handel.dll - - - $(SonetaBinaries)Soneta.Types.dll - True - - - - - - - - - - - - - - - - - {8372decb-e2d0-46e1-98e2-42527f5409a9} - GeekOut2018.EnovaUnitTestExtension - - - - - - + + - - \ No newline at end of file + diff --git a/GeekOut2018.EnovaUnitTestExtension.Tests/Properties/AssemblyInfo.cs b/GeekOut2018.EnovaUnitTestExtension.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index e52e6b2..0000000 --- a/GeekOut2018.EnovaUnitTestExtension.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.EnovaUnitTestExtension.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.EnovaUnitTestExtension.Tests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4f26ca80-4be8-47d9-a114-c7b4544de353")] - -// 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/GeekOut2018.EnovaUnitTestExtension.Tests/packages.config b/GeekOut2018.EnovaUnitTestExtension.Tests/packages.config deleted file mode 100644 index 116d50c..0000000 --- a/GeekOut2018.EnovaUnitTestExtension.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GeekOut2018.TestExamples.Tests/GeekOut2018.TestExamples.Tests.csproj b/GeekOut2018.TestExamples.Tests/GeekOut2018.TestExamples.Tests.csproj index 8c6b45d..21fad61 100644 --- a/GeekOut2018.TestExamples.Tests/GeekOut2018.TestExamples.Tests.csproj +++ b/GeekOut2018.TestExamples.Tests/GeekOut2018.TestExamples.Tests.csproj @@ -1,61 +1,10 @@  - - + - Debug - AnyCPU - {B2FB5BD5-4387-4738-934B-12A70807F06D} - Library - Properties - GeekOut2018.TestExamples.Tests - GeekOut2018.TestExamples.Tests - v4.0 - 512 + $(SonetaTargetFramework) + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll - - - - - - - - - - - - - - - - - - - {cc369ab2-e5e5-4c8c-9cca-f6852b7bfc3f} - GeekOut2018.TestExamples - - - + - - \ No newline at end of file + diff --git a/GeekOut2018.TestExamples.Tests/Properties/AssemblyInfo.cs b/GeekOut2018.TestExamples.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 9b933e0..0000000 --- a/GeekOut2018.TestExamples.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.TestExamples.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.TestExamples.Tests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b2fb5bd5-4387-4738-934b-12a70807f06d")] - -// 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/GeekOut2018.TestExamples.Tests/packages.config b/GeekOut2018.TestExamples.Tests/packages.config deleted file mode 100644 index 116d50c..0000000 --- a/GeekOut2018.TestExamples.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GeekOut2018.TestExamples/GeekOut2018.TestExamples.csproj b/GeekOut2018.TestExamples/GeekOut2018.TestExamples.csproj index 1e42f09..9b548a1 100644 --- a/GeekOut2018.TestExamples/GeekOut2018.TestExamples.csproj +++ b/GeekOut2018.TestExamples/GeekOut2018.TestExamples.csproj @@ -1,46 +1,6 @@  - - + - Debug - AnyCPU - {CC369AB2-E5E5-4C8C-9CCA-F6852B7BFC3F} - Library - Properties - GeekOut2018.TestExamples - GeekOut2018.TestExamples - v4.0 - 512 + $(SonetaTargetFramework) - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/GeekOut2018.TestExamples/Properties/AssemblyInfo.cs b/GeekOut2018.TestExamples/Properties/AssemblyInfo.cs deleted file mode 100644 index d5e83fc..0000000 --- a/GeekOut2018.TestExamples/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("GeekOut2018.TestExamples")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GeekOut2018.TestExamples")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cc369ab2-e5e5-4c8c-9cca-f6852b7bfc3f")] - -// 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/MSBuild/common.soneta.assembly.props b/MSBuild/common.soneta.assembly.props deleted file mode 100644 index 9f03316..0000000 --- a/MSBuild/common.soneta.assembly.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - C:\Program Files\Common Files\Soneta\Assemblies\ - D:\MyProjects\enova\bin\Debug\ - - \ No newline at end of file diff --git a/README.md b/README.md index efb76ab..dfd93e2 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,6 @@ Repozytorium zawiera przykłady omawiane podczas prezentacji. ### Konfiguracja środowiska -Przykłady wykorzystujące biblioteki enova365 wymagają ustawienia dwóch parametrów w pliku ***MSBuild\common.soneta.assembly.props*** - - ExtensionOtput - ścieżka zawierająca dodatki ładowane przez enova365 - - SonetaBinaries - binaria enova365 - - Przykład ***GeekOut2018.EnovaExtension.Tests*** zawiera referencję do bibliteki ***Soneta.Test***, która daje możliwość pisania testów integracyjnych w enova365. Biblioteka ta nie jest jeszcze oficjalnie dostępna, jednak dla celów demonstracyjnych podpięliśmy ją do projektu. Aby uruchomić ten przykład z konkretną wersją aplikacji enova365, należy zmodyfikować wersję bibliotek - - Soneta.Business - - Soneta.Types - - Soneta.Start - -w pliku ***GeekOut2018.EnovaExtension.Tests\App.config***. Biblioteka ***Soneta.Test*** skompilowana została z zależnościami, które widoczne są w atrybucie oldVersion, natomiast konkretną wersję ustawiamy w atrybucie newVersion. +W pliku ***Directory.Build.props*** zdefiniować możemy następujące parametry +- SonetaPackageVersion - wersja bibliotek enova365, z jakimi kompilowane są biblioteki +- ExtensionOtput - ścieżka, do której kompilowana jest dana biblioteka \ No newline at end of file diff --git a/TestLib/Soneta.Test.dll b/TestLib/Soneta.Test.dll deleted file mode 100644 index dbc6aa2..0000000 Binary files a/TestLib/Soneta.Test.dll and /dev/null differ diff --git a/global.json b/global.json new file mode 100644 index 0000000..89a15bc --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "Soneta.Sdk": "1.0.3" + } +} \ No newline at end of file