From 74c4c71512eafb1072070048c0df5df834a28331 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 13:09:40 +0100 Subject: [PATCH 01/90] #27 --- .../DocumentManager/DocumentManager.csproj | 29 ++++++++++++++ .../DocumentManager/DocumentManager.xproj | 18 --------- .../DocumentManager/project.json | 21 ---------- .../GenericMethods/GenericMethods.csproj | 29 ++++++++++++++ .../GenericMethods/GenericMethods.xproj | 18 --------- .../GenericMethods/project.json | 21 ---------- Generics/GenericsSamples/GenericsSamples.sln | 40 +++++++++---------- .../LinkedListObjects.csproj | 29 ++++++++++++++ .../LinkedListObjects/LinkedListObjects.xproj | 18 --------- .../LinkedListObjects/project.json | 21 ---------- .../LinkedListSample/LinkedListSample.csproj | 29 ++++++++++++++ .../LinkedListSample/LinkedListSample.xproj | 18 --------- .../LinkedListSample/project.json | 21 ---------- .../Specialization/Specialization.csproj | 29 ++++++++++++++ .../Specialization/Specialization.xproj | 18 --------- .../Specialization/project.json | 21 ---------- .../GenericsSamples/Variance/Variance.csproj | 29 ++++++++++++++ .../GenericsSamples/Variance/Variance.xproj | 18 --------- .../GenericsSamples/Variance/project.json | 21 ---------- 19 files changed, 194 insertions(+), 254 deletions(-) create mode 100644 Generics/GenericsSamples/DocumentManager/DocumentManager.csproj delete mode 100644 Generics/GenericsSamples/DocumentManager/DocumentManager.xproj delete mode 100644 Generics/GenericsSamples/DocumentManager/project.json create mode 100644 Generics/GenericsSamples/GenericMethods/GenericMethods.csproj delete mode 100644 Generics/GenericsSamples/GenericMethods/GenericMethods.xproj delete mode 100644 Generics/GenericsSamples/GenericMethods/project.json create mode 100644 Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.csproj delete mode 100644 Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.xproj delete mode 100644 Generics/GenericsSamples/LinkedListObjects/project.json create mode 100644 Generics/GenericsSamples/LinkedListSample/LinkedListSample.csproj delete mode 100644 Generics/GenericsSamples/LinkedListSample/LinkedListSample.xproj delete mode 100644 Generics/GenericsSamples/LinkedListSample/project.json create mode 100644 Generics/GenericsSamples/Specialization/Specialization.csproj delete mode 100644 Generics/GenericsSamples/Specialization/Specialization.xproj delete mode 100644 Generics/GenericsSamples/Specialization/project.json create mode 100644 Generics/GenericsSamples/Variance/Variance.csproj delete mode 100644 Generics/GenericsSamples/Variance/Variance.xproj delete mode 100644 Generics/GenericsSamples/Variance/project.json diff --git a/Generics/GenericsSamples/DocumentManager/DocumentManager.csproj b/Generics/GenericsSamples/DocumentManager/DocumentManager.csproj new file mode 100644 index 00000000..b9098195 --- /dev/null +++ b/Generics/GenericsSamples/DocumentManager/DocumentManager.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + DocumentManager + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/DocumentManager/DocumentManager.xproj b/Generics/GenericsSamples/DocumentManager/DocumentManager.xproj deleted file mode 100644 index 52812053..00000000 --- a/Generics/GenericsSamples/DocumentManager/DocumentManager.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 44260535-ac39-43f8-b0db-59749cd5d615 - DocumentManager - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/DocumentManager/project.json b/Generics/GenericsSamples/DocumentManager/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/DocumentManager/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Generics/GenericsSamples/GenericMethods/GenericMethods.csproj b/Generics/GenericsSamples/GenericMethods/GenericMethods.csproj new file mode 100644 index 00000000..f3e284cc --- /dev/null +++ b/Generics/GenericsSamples/GenericMethods/GenericMethods.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + GenericMethods + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/GenericMethods/GenericMethods.xproj b/Generics/GenericsSamples/GenericMethods/GenericMethods.xproj deleted file mode 100644 index 441f04a7..00000000 --- a/Generics/GenericsSamples/GenericMethods/GenericMethods.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9dc1e281-f716-4127-8faf-bff4d8b858ba - GenericMethods - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/GenericMethods/project.json b/Generics/GenericsSamples/GenericMethods/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/GenericMethods/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Generics/GenericsSamples/GenericsSamples.sln b/Generics/GenericsSamples/GenericsSamples.sln index 17cf342c..a9cac86d 100644 --- a/Generics/GenericsSamples/GenericsSamples.sln +++ b/Generics/GenericsSamples/GenericsSamples.sln @@ -1,19 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DocumentManager", "DocumentManager\DocumentManager.xproj", "{44260535-AC39-43F8-B0DB-59749CD5D615}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentManager", "DocumentManager\DocumentManager.csproj", "{44260535-AC39-43F8-B0DB-59749CD5D615}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GenericMethods", "GenericMethods\GenericMethods.xproj", "{9DC1E281-F716-4127-8FAF-BFF4D8B858BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericMethods", "GenericMethods\GenericMethods.csproj", "{9DC1E281-F716-4127-8FAF-BFF4D8B858BA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinkedListObjects", "LinkedListObjects\LinkedListObjects.xproj", "{3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkedListObjects", "LinkedListObjects\LinkedListObjects.csproj", "{3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinkedListSample", "LinkedListSample\LinkedListSample.xproj", "{99A0DD3D-98EF-4458-84D0-857D503532E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkedListSample", "LinkedListSample\LinkedListSample.csproj", "{99A0DD3D-98EF-4458-84D0-857D503532E1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Specialization", "Specialization\Specialization.xproj", "{771B3CF7-8D45-4EE2-A295-01264C2240C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Specialization", "Specialization\Specialization.csproj", "{771B3CF7-8D45-4EE2-A295-01264C2240C0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Variance", "Variance\Variance.xproj", "{5FA8A8A0-A932-41AE-8E2C-20761BD81C58}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Variance", "Variance\Variance.csproj", "{5FA8A8A0-A932-41AE-8E2C-20761BD81C58}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,28 +23,28 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {44260535-AC39-43F8-B0DB-59749CD5D615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44260535-AC39-43F8-B0DB-59749CD5D615}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44260535-AC39-43F8-B0DB-59749CD5D615}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44260535-AC39-43F8-B0DB-59749CD5D615}.Release|Any CPU.Build.0 = Release|Any CPU + {44260535-AC39-43F8-B0DB-59749CD5D615}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {44260535-AC39-43F8-B0DB-59749CD5D615}.Release|Any CPU.Build.0 = Debug|Any CPU {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Release|Any CPU.Build.0 = Release|Any CPU + {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {9DC1E281-F716-4127-8FAF-BFF4D8B858BA}.Release|Any CPU.Build.0 = Debug|Any CPU {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Release|Any CPU.Build.0 = Release|Any CPU + {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {3374CFA6-CCEE-424B-87D8-ED5B210BAAD1}.Release|Any CPU.Build.0 = Debug|Any CPU {99A0DD3D-98EF-4458-84D0-857D503532E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {99A0DD3D-98EF-4458-84D0-857D503532E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99A0DD3D-98EF-4458-84D0-857D503532E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99A0DD3D-98EF-4458-84D0-857D503532E1}.Release|Any CPU.Build.0 = Release|Any CPU + {99A0DD3D-98EF-4458-84D0-857D503532E1}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {99A0DD3D-98EF-4458-84D0-857D503532E1}.Release|Any CPU.Build.0 = Debug|Any CPU {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Release|Any CPU.Build.0 = Release|Any CPU + {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {771B3CF7-8D45-4EE2-A295-01264C2240C0}.Release|Any CPU.Build.0 = Debug|Any CPU {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Release|Any CPU.Build.0 = Release|Any CPU + {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5FA8A8A0-A932-41AE-8E2C-20761BD81C58}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.csproj b/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.csproj new file mode 100644 index 00000000..06b1bca5 --- /dev/null +++ b/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + LinkedListObjects + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.xproj b/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.xproj deleted file mode 100644 index e6cf66bb..00000000 --- a/Generics/GenericsSamples/LinkedListObjects/LinkedListObjects.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3374cfa6-ccee-424b-87d8-ed5b210baad1 - LinkedListObjects - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/LinkedListObjects/project.json b/Generics/GenericsSamples/LinkedListObjects/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/LinkedListObjects/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Generics/GenericsSamples/LinkedListSample/LinkedListSample.csproj b/Generics/GenericsSamples/LinkedListSample/LinkedListSample.csproj new file mode 100644 index 00000000..5d4ad9be --- /dev/null +++ b/Generics/GenericsSamples/LinkedListSample/LinkedListSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + LinkedListSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/LinkedListSample/LinkedListSample.xproj b/Generics/GenericsSamples/LinkedListSample/LinkedListSample.xproj deleted file mode 100644 index 58e5a539..00000000 --- a/Generics/GenericsSamples/LinkedListSample/LinkedListSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 99a0dd3d-98ef-4458-84d0-857d503532e1 - LinkedListSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/LinkedListSample/project.json b/Generics/GenericsSamples/LinkedListSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/LinkedListSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Generics/GenericsSamples/Specialization/Specialization.csproj b/Generics/GenericsSamples/Specialization/Specialization.csproj new file mode 100644 index 00000000..685568ba --- /dev/null +++ b/Generics/GenericsSamples/Specialization/Specialization.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + Specialization + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/Specialization/Specialization.xproj b/Generics/GenericsSamples/Specialization/Specialization.xproj deleted file mode 100644 index a1ebcd57..00000000 --- a/Generics/GenericsSamples/Specialization/Specialization.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 771b3cf7-8d45-4ee2-a295-01264c2240c0 - Specialization - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/Specialization/project.json b/Generics/GenericsSamples/Specialization/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/Specialization/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Generics/GenericsSamples/Variance/Variance.csproj b/Generics/GenericsSamples/Variance/Variance.csproj new file mode 100644 index 00000000..090e0dc9 --- /dev/null +++ b/Generics/GenericsSamples/Variance/Variance.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + Variance + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Generics/GenericsSamples/Variance/Variance.xproj b/Generics/GenericsSamples/Variance/Variance.xproj deleted file mode 100644 index 6e9b6599..00000000 --- a/Generics/GenericsSamples/Variance/Variance.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5fa8a8a0-a932-41ae-8e2c-20761bd81c58 - Variance - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Generics/GenericsSamples/Variance/project.json b/Generics/GenericsSamples/Variance/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Generics/GenericsSamples/Variance/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 9e1378b66895a770245a5b58a53360437c7197c0 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 15:03:07 +0100 Subject: [PATCH 02/90] MSBuild #27 --- HelloWorld/HelloWorldApp/HelloWorldApp.csproj | 25 +++++++++++++++++++ HelloWorld/HelloWorldApp/Program.cs | 11 +++----- HelloWorld/HelloWorldApp/project.json | 19 -------------- 3 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 HelloWorld/HelloWorldApp/HelloWorldApp.csproj delete mode 100644 HelloWorld/HelloWorldApp/project.json diff --git a/HelloWorld/HelloWorldApp/HelloWorldApp.csproj b/HelloWorld/HelloWorldApp/HelloWorldApp.csproj new file mode 100644 index 00000000..82c832ae --- /dev/null +++ b/HelloWorld/HelloWorldApp/HelloWorldApp.csproj @@ -0,0 +1,25 @@ + + + + + Exe + netcoreapp1.0 + + + + + + + + + + 1.0.1 + + + 1.0.0-alpha-20161104-2 + All + + + + + diff --git a/HelloWorld/HelloWorldApp/Program.cs b/HelloWorld/HelloWorldApp/Program.cs index 51233cff..c81448f5 100644 --- a/HelloWorld/HelloWorldApp/Program.cs +++ b/HelloWorld/HelloWorldApp/Program.cs @@ -1,12 +1,9 @@ -using System; +using System; -namespace ConsoleApplication +class Program { - public class Program + static void Main(string[] args) { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } + Console.WriteLine("Hello World!"); } } diff --git a/HelloWorld/HelloWorldApp/project.json b/HelloWorld/HelloWorldApp/project.json deleted file mode 100644 index 0e21757b..00000000 --- a/HelloWorld/HelloWorldApp/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": "dnxcore50" - } - } -} From ef42f5fb7ab2e2f44c4893a65293edaafd4bd350 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 15:37:39 +0100 Subject: [PATCH 03/90] MSBuild .NET Core 1.1 #27 --- .../ArgumentsSample/ArgumentsSample.csproj | 29 +++++++ .../ArgumentsSample/ArgumentsSample.xproj | 18 ---- .../ArgumentsSample/project.json | 21 ----- .../CoreCSharpSamples/CoreCSharpSamples.sln | 84 +++++++++---------- .../EnumerationSample.csproj | 29 +++++++ .../EnumerationSample/EnumerationSample.xproj | 18 ---- .../EnumerationSample/project.json | 22 ----- .../CoreCSharpSamples/ForLoop/ForLoop.csproj | 29 +++++++ .../CoreCSharpSamples/ForLoop/ForLoop.xproj | 18 ---- .../CoreCSharpSamples/ForLoop/project.json | 21 ----- .../HelloWorldApp/HelloWorldApp.csproj | 29 +++++++ .../HelloWorldApp/HelloWorldApp.xproj | 25 ------ .../HelloWorldApp/project.json | 21 ----- .../IfStatement/IfStatement.csproj | 29 +++++++ .../IfStatement/IfStatement.xproj | 18 ---- .../IfStatement/project.json | 21 ----- .../MathClient/MathClient.csproj | 32 +++++++ .../MathClient/MathClient.xproj | 18 ---- .../CoreCSharpSamples/MathClient/project.json | 22 ----- .../CoreCSharpSamples/MathLib/MathLib.csproj | 29 +++++++ .../CoreCSharpSamples/MathLib/MathLib.xproj | 21 ----- .../CoreCSharpSamples/MathLib/project.json | 13 --- .../NamespaceSample/NamespaceSample.csproj | 29 +++++++ .../NamespaceSample/NamespaceSample.xproj | 18 ---- .../NamespaceSample/project.json | 21 ----- .../StringSample/StringSample.csproj | 29 +++++++ .../StringSample/StringSample.xproj | 18 ---- .../StringSample/project.json | 21 ----- .../VariableScopeSample.csproj | 29 +++++++ .../VariableScopeSample.xproj | 18 ---- .../VariableScopeSample/project.json | 21 ----- .../VariableScopeSample2.csproj | 35 ++++++++ .../VariableScopeSample2.xproj | 18 ---- .../VariableScopeSample2/project.json | 21 ----- .../VariableScopeSample3.csproj | 35 ++++++++ .../VariableScopeSample3.xproj | 18 ---- .../VariableScopeSample3/project.json | 21 ----- .../VariablesSample/VariablesSample.csproj | 29 +++++++ .../VariablesSample/VariablesSample.xproj | 18 ---- .../VariablesSample/project.json | 21 ----- 40 files changed, 434 insertions(+), 553 deletions(-) create mode 100644 CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/ArgumentsSample/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/EnumerationSample/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/ForLoop/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/HelloWorldApp/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/IfStatement/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/MathClient/MathClient.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/MathClient/MathClient.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/MathClient/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/MathLib/MathLib.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/MathLib/MathLib.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/MathLib/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/NamespaceSample/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/StringSample/StringSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/StringSample/StringSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/StringSample/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample2/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariableScopeSample3/project.json create mode 100644 CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.csproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.xproj delete mode 100644 CoreCSharp/CoreCSharpSamples/VariablesSample/project.json diff --git a/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.csproj b/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.csproj new file mode 100644 index 00000000..87e393c7 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + ArgumentsSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.xproj b/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.xproj deleted file mode 100644 index 9aa76abf..00000000 --- a/CoreCSharp/CoreCSharpSamples/ArgumentsSample/ArgumentsSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 26fc9885-1a46-49d6-9951-c993d29b48bb - ArgumentsSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/ArgumentsSample/project.json b/CoreCSharp/CoreCSharpSamples/ArgumentsSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/ArgumentsSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/CoreCSharpSamples.sln b/CoreCSharp/CoreCSharpSamples/CoreCSharpSamples.sln index 813fe1a6..1c982845 100644 --- a/CoreCSharp/CoreCSharpSamples/CoreCSharpSamples.sln +++ b/CoreCSharp/CoreCSharpSamples/CoreCSharpSamples.sln @@ -1,35 +1,35 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ArgumentsSample", "ArgumentsSample\ArgumentsSample.xproj", "{26FC9885-1A46-49D6-9951-C993D29B48BB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{612A1832-912A-40D9-8CB1-73C1C758C481}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EnumerationSample", "EnumerationSample\EnumerationSample.xproj", "{6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsSample", "ArgumentsSample\ArgumentsSample.csproj", "{26FC9885-1A46-49D6-9951-C993D29B48BB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ForLoop", "ForLoop\ForLoop.xproj", "{0E437187-EF2C-4D65-BD31-BD5BEC525260}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumerationSample", "EnumerationSample\EnumerationSample.csproj", "{6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HelloWorldApp", "HelloWorldApp\HelloWorldApp.xproj", "{70F9F454-C0D4-4625-A2CB-1D22D5019E6C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForLoop", "ForLoop\ForLoop.csproj", "{0E437187-EF2C-4D65-BD31-BD5BEC525260}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IfStatement", "IfStatement\IfStatement.xproj", "{577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorldApp", "HelloWorldApp\HelloWorldApp.csproj", "{70F9F454-C0D4-4625-A2CB-1D22D5019E6C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MathClient", "MathClient\MathClient.xproj", "{426C6F03-E8A1-46F2-8127-775B21BF9B25}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IfStatement", "IfStatement\IfStatement.csproj", "{577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NamespaceSample", "NamespaceSample\NamespaceSample.xproj", "{6616BCDA-448E-41A1-B605-7E8DE3BAB833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathClient", "MathClient\MathClient.csproj", "{426C6F03-E8A1-46F2-8127-775B21BF9B25}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StringSample", "StringSample\StringSample.xproj", "{F5D497F6-A89C-4031-A932-71BE811106F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NamespaceSample", "NamespaceSample\NamespaceSample.csproj", "{6616BCDA-448E-41A1-B605-7E8DE3BAB833}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VariableScopeSample", "VariableScopeSample\VariableScopeSample.xproj", "{DEC97933-9C6E-4B59-A821-6C7505800BFB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StringSample", "StringSample\StringSample.csproj", "{F5D497F6-A89C-4031-A932-71BE811106F3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VariablesSample", "VariablesSample\VariablesSample.xproj", "{CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VariableScopeSample", "VariableScopeSample\VariableScopeSample.csproj", "{DEC97933-9C6E-4B59-A821-6C7505800BFB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{612A1832-912A-40D9-8CB1-73C1C758C481}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VariablesSample", "VariablesSample\VariablesSample.csproj", "{CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VariableScopeSample2", "VariableScopeSample2\VariableScopeSample2.xproj", "{1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VariableScopeSample2", "VariableScopeSample2\VariableScopeSample2.csproj", "{1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VariableScopeSample3", "VariableScopeSample3\VariableScopeSample3.xproj", "{7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VariableScopeSample3", "VariableScopeSample3\VariableScopeSample3.csproj", "{7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MathLib", "MathLib\MathLib.xproj", "{995AD981-04DF-41A5-8959-480BBDE4A424}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathLib", "MathLib\MathLib.csproj", "{995AD981-04DF-41A5-8959-480BBDE4A424}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,56 +39,56 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {26FC9885-1A46-49D6-9951-C993D29B48BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {26FC9885-1A46-49D6-9951-C993D29B48BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26FC9885-1A46-49D6-9951-C993D29B48BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26FC9885-1A46-49D6-9951-C993D29B48BB}.Release|Any CPU.Build.0 = Release|Any CPU + {26FC9885-1A46-49D6-9951-C993D29B48BB}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {26FC9885-1A46-49D6-9951-C993D29B48BB}.Release|Any CPU.Build.0 = Debug|Any CPU {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Release|Any CPU.Build.0 = Release|Any CPU + {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {6175F1CE-A02E-4DCA-9E22-5DBEFF60C387}.Release|Any CPU.Build.0 = Debug|Any CPU {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Release|Any CPU.Build.0 = Release|Any CPU + {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {0E437187-EF2C-4D65-BD31-BD5BEC525260}.Release|Any CPU.Build.0 = Debug|Any CPU {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Release|Any CPU.Build.0 = Release|Any CPU + {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {70F9F454-C0D4-4625-A2CB-1D22D5019E6C}.Release|Any CPU.Build.0 = Debug|Any CPU {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Release|Any CPU.Build.0 = Release|Any CPU + {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {577DC8FA-FD57-4CE3-B3B0-2981ACFAC4AE}.Release|Any CPU.Build.0 = Debug|Any CPU {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Release|Any CPU.Build.0 = Release|Any CPU + {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {426C6F03-E8A1-46F2-8127-775B21BF9B25}.Release|Any CPU.Build.0 = Debug|Any CPU {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Release|Any CPU.Build.0 = Release|Any CPU + {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {6616BCDA-448E-41A1-B605-7E8DE3BAB833}.Release|Any CPU.Build.0 = Debug|Any CPU {F5D497F6-A89C-4031-A932-71BE811106F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5D497F6-A89C-4031-A932-71BE811106F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5D497F6-A89C-4031-A932-71BE811106F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5D497F6-A89C-4031-A932-71BE811106F3}.Release|Any CPU.Build.0 = Release|Any CPU + {F5D497F6-A89C-4031-A932-71BE811106F3}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {F5D497F6-A89C-4031-A932-71BE811106F3}.Release|Any CPU.Build.0 = Debug|Any CPU {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Release|Any CPU.Build.0 = Release|Any CPU + {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {DEC97933-9C6E-4B59-A821-6C7505800BFB}.Release|Any CPU.Build.0 = Debug|Any CPU {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Release|Any CPU.Build.0 = Release|Any CPU + {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {CB78BCCC-31EC-4B67-AA6E-FA65AC136A90}.Release|Any CPU.Build.0 = Debug|Any CPU {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Release|Any CPU.Build.0 = Release|Any CPU + {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {1DA18881-24AB-4B55-A76C-7A2FCD9C40D6}.Release|Any CPU.Build.0 = Debug|Any CPU {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Release|Any CPU.Build.0 = Release|Any CPU + {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {7DDACFFA-57E4-4994-B3F4-AA2AB8BFB4D8}.Release|Any CPU.Build.0 = Debug|Any CPU {995AD981-04DF-41A5-8959-480BBDE4A424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {995AD981-04DF-41A5-8959-480BBDE4A424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {995AD981-04DF-41A5-8959-480BBDE4A424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {995AD981-04DF-41A5-8959-480BBDE4A424}.Release|Any CPU.Build.0 = Release|Any CPU + {995AD981-04DF-41A5-8959-480BBDE4A424}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {995AD981-04DF-41A5-8959-480BBDE4A424}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.csproj b/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.csproj new file mode 100644 index 00000000..493c36c2 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + EnumerationSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.xproj b/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.xproj deleted file mode 100644 index 99bd7536..00000000 --- a/CoreCSharp/CoreCSharpSamples/EnumerationSample/EnumerationSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6175f1ce-a02e-4dca-9e22-5dbeff60c387 - EnumerationSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/EnumerationSample/project.json b/CoreCSharp/CoreCSharpSamples/EnumerationSample/project.json deleted file mode 100644 index ea7d131d..00000000 --- a/CoreCSharp/CoreCSharpSamples/EnumerationSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - - }, - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.csproj b/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.csproj new file mode 100644 index 00000000..8983e516 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + ForLoop + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.xproj b/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.xproj deleted file mode 100644 index 9b681366..00000000 --- a/CoreCSharp/CoreCSharpSamples/ForLoop/ForLoop.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0e437187-ef2c-4d65-bd31-bd5bec525260 - ForLoop - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/ForLoop/project.json b/CoreCSharp/CoreCSharpSamples/ForLoop/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/ForLoop/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.csproj b/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.csproj new file mode 100644 index 00000000..eb077beb --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + HelloWorldApp + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.xproj b/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.xproj deleted file mode 100644 index 1e8755a2..00000000 --- a/CoreCSharp/CoreCSharpSamples/HelloWorldApp/HelloWorldApp.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 70f9f454-c0d4-4625-a2cb-1d22d5019e6c - Wrox.HelloWorldApp - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - HelloWorldApp - - - 2.0 - True - - - True - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/HelloWorldApp/project.json b/CoreCSharp/CoreCSharpSamples/HelloWorldApp/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/HelloWorldApp/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.csproj b/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.csproj new file mode 100644 index 00000000..3be367c2 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + IfStatement + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.xproj b/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.xproj deleted file mode 100644 index f041c4a4..00000000 --- a/CoreCSharp/CoreCSharpSamples/IfStatement/IfStatement.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 577dc8fa-fd57-4ce3-b3b0-2981acfac4ae - IfStatement - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/IfStatement/project.json b/CoreCSharp/CoreCSharpSamples/IfStatement/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/IfStatement/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.csproj b/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.csproj new file mode 100644 index 00000000..6f39ce1b --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.csproj @@ -0,0 +1,32 @@ + + + + netcoreapp1.0 + MathClient + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.xproj b/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.xproj deleted file mode 100644 index d56373b8..00000000 --- a/CoreCSharp/CoreCSharpSamples/MathClient/MathClient.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 426c6f03-e8a1-46f2-8127-775b21bf9b25 - MathClient - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/MathClient/project.json b/CoreCSharp/CoreCSharpSamples/MathClient/project.json deleted file mode 100644 index 2430bc70..00000000 --- a/CoreCSharp/CoreCSharpSamples/MathClient/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "MathLib": "1.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.csproj b/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.csproj new file mode 100644 index 00000000..a858529c --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.csproj @@ -0,0 +1,29 @@ + + + + netstandard1.6 + MathLib + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.1 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.xproj b/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.xproj deleted file mode 100644 index 1fa3c661..00000000 --- a/CoreCSharp/CoreCSharpSamples/MathLib/MathLib.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 995ad981-04df-41a5-8959-480bbde4a424 - MathLib - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/CoreCSharp/CoreCSharpSamples/MathLib/project.json b/CoreCSharp/CoreCSharpSamples/MathLib/project.json deleted file mode 100644 index 864b9a5f..00000000 --- a/CoreCSharp/CoreCSharpSamples/MathLib/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.csproj b/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.csproj new file mode 100644 index 00000000..4b4adff7 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + NamespaceSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.xproj b/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.xproj deleted file mode 100644 index ed2be200..00000000 --- a/CoreCSharp/CoreCSharpSamples/NamespaceSample/NamespaceSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6616bcda-448e-41a1-b605-7e8de3bab833 - NamespaceSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/NamespaceSample/project.json b/CoreCSharp/CoreCSharpSamples/NamespaceSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/NamespaceSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.csproj b/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.csproj new file mode 100644 index 00000000..82e0e492 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + StringSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.xproj b/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.xproj deleted file mode 100644 index 368c48bb..00000000 --- a/CoreCSharp/CoreCSharpSamples/StringSample/StringSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f5d497f6-a89c-4031-a932-71be811106f3 - StringSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/StringSample/project.json b/CoreCSharp/CoreCSharpSamples/StringSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/StringSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.csproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.csproj new file mode 100644 index 00000000..ce41925a --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + VariableScopeSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.xproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.xproj deleted file mode 100644 index 96a14395..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample/VariableScopeSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - dec97933-9c6e-4b59-a821-6c7505800bfb - VariableScopeSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample/project.json b/CoreCSharp/CoreCSharpSamples/VariableScopeSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.csproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.csproj new file mode 100644 index 00000000..e957091a --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + VariableScopeSample2 + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.xproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.xproj deleted file mode 100644 index c1729e8a..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/VariableScopeSample2.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1da18881-24ab-4b55-a76c-7a2fcd9c40d6 - VariableScopeSample2 - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/project.json b/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample2/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.csproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.csproj new file mode 100644 index 00000000..0b3ebbc5 --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + VariableScopeSample3 + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.xproj b/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.xproj deleted file mode 100644 index 090d9fbd..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/VariableScopeSample3.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7ddacffa-57e4-4994-b3f4-aa2ab8bfb4d8 - VariableScopeSample3 - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/project.json b/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariableScopeSample3/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.csproj b/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.csproj new file mode 100644 index 00000000..9fe379fb --- /dev/null +++ b/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + VariablesSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.xproj b/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.xproj deleted file mode 100644 index 3ae8a806..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariablesSample/VariablesSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cb78bccc-31ec-4b67-aa6e-fa65ac136a90 - VariablesSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/CoreCSharp/CoreCSharpSamples/VariablesSample/project.json b/CoreCSharp/CoreCSharpSamples/VariablesSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/CoreCSharp/CoreCSharpSamples/VariablesSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 4d4e783fc33716944592a94484e070f31093a878 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 17:08:19 +0100 Subject: [PATCH 04/90] MSBuild .NET Core 1.1 #27 --- .../EnumSample/EnumSample.csproj | 29 ++++++++++ .../EnumSample/EnumSample.xproj | 18 ------- .../ObjectsAndTypes/EnumSample/project.json | 20 ------- .../ExtensionMethods/ExtensionMethods.csproj | 29 ++++++++++ .../ExtensionMethods/ExtensionMethods.xproj | 18 ------- .../ExtensionMethods/project.json | 20 ------- .../MathSample/MathSample.csproj | 35 ++++++++++++ .../MathSample/MathSample.xproj | 18 ------- .../ObjectsAndTypes/MathSample/project.json | 20 ------- .../MethodSample/MethodSample.csproj | 29 ++++++++++ .../MethodSample/MethodSample.xproj | 18 ------- .../ObjectsAndTypes/MethodSample/project.json | 20 ------- .../ObjectsAndTypes/ObjectsAndTypes.sln | 54 +++++++++---------- .../OutKeywordSample/OutKeywordSample.csproj | 29 ++++++++++ .../OutKeywordSample/OutKeywordSample.xproj | 18 ------- .../OutKeywordSample/project.json | 20 ------- .../PassingByValueAndByReference.xproj | 18 ------- .../PassingByValueAndReference.csproj | 29 ++++++++++ .../PassingByValueAndReference/project.json | 20 ------- .../StaticConstructorSample.csproj | 29 ++++++++++ .../StaticConstructorSample.xproj | 18 ------- .../StaticConstructorSample/project.json | 20 ------- .../StructsSample/StructsSample.csproj | 29 ++++++++++ .../StructsSample/StructsSample.xproj | 18 ------- .../StructsSample/project.json | 20 ------- 25 files changed, 265 insertions(+), 331 deletions(-) create mode 100644 ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/EnumSample/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/MathSample/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/MethodSample/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/project.json delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndByReference.xproj create mode 100644 ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndReference.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/project.json create mode 100644 ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.csproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.xproj delete mode 100644 ObjectsAndTypes/ObjectsAndTypes/StructsSample/project.json diff --git a/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.csproj new file mode 100644 index 00000000..9d1e14de --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + EnumSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.xproj deleted file mode 100644 index 0abe3cf2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/EnumSample/EnumSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - eb534c37-1efa-4077-a272-b1c457b56be2 - EnumSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/EnumSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/EnumSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/EnumSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.csproj b/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.csproj new file mode 100644 index 00000000..40dac2de --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + ExtensionMethods + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.xproj b/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.xproj deleted file mode 100644 index 544e1456..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/ExtensionMethods.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b4c41669-d700-4455-ac65-54370f1113e8 - ExtensionMethods - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/project.json b/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/ExtensionMethods/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.csproj new file mode 100644 index 00000000..8b13715f --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + MathSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.xproj deleted file mode 100644 index 809e2595..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/MathSample/MathSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 14663874-4207-4ad4-b679-c39aeac74290 - MathSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/MathSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/MathSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/MathSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.csproj new file mode 100644 index 00000000..f1da0e80 --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + MethodSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.xproj deleted file mode 100644 index 3f25815f..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/MethodSample/MethodSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 210d38eb-2a2a-40e7-9f5d-29af7e519b67 - MethodSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/MethodSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/MethodSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/MethodSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/ObjectsAndTypes.sln b/ObjectsAndTypes/ObjectsAndTypes/ObjectsAndTypes.sln index 80e00a28..6195b621 100644 --- a/ObjectsAndTypes/ObjectsAndTypes/ObjectsAndTypes.sln +++ b/ObjectsAndTypes/ObjectsAndTypes/ObjectsAndTypes.sln @@ -1,25 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PassingByValueAndByReference", "PassingByValueAndReference\PassingByValueAndByReference.xproj", "{CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D7E4A2E1-F4A5-4132-8FB9-CA0855F64C3E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExtensionMethods", "ExtensionMethods\ExtensionMethods.xproj", "{B4C41669-D700-4455-AC65-54370F1113E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PassingByValueAndReference", "PassingByValueAndReference\PassingByValueAndReference.csproj", "{CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MethodSample", "MethodSample\MethodSample.xproj", "{210D38EB-2A2A-40E7-9F5D-29AF7E519B67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtensionMethods", "ExtensionMethods\ExtensionMethods.csproj", "{B4C41669-D700-4455-AC65-54370F1113E8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StaticConstructorSample", "StaticConstructorSample\StaticConstructorSample.xproj", "{113847B7-E2D3-4067-963B-ACE282849CEF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MethodSample", "MethodSample\MethodSample.csproj", "{210D38EB-2A2A-40E7-9F5D-29AF7E519B67}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StructsSample", "StructsSample\StructsSample.xproj", "{756F6933-3356-4AA8-855D-61D44A9230FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticConstructorSample", "StaticConstructorSample\StaticConstructorSample.csproj", "{113847B7-E2D3-4067-963B-ACE282849CEF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OutKeywordSample", "OutKeywordSample\OutKeywordSample.xproj", "{82BA4925-EE3B-46D4-84BA-D0DC228F3EED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructsSample", "StructsSample\StructsSample.csproj", "{756F6933-3356-4AA8-855D-61D44A9230FD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EnumSample", "EnumSample\EnumSample.xproj", "{EB534C37-1EFA-4077-A272-B1C457B56BE2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutKeywordSample", "OutKeywordSample\OutKeywordSample.csproj", "{82BA4925-EE3B-46D4-84BA-D0DC228F3EED}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D7E4A2E1-F4A5-4132-8FB9-CA0855F64C3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumSample", "EnumSample\EnumSample.csproj", "{EB534C37-1EFA-4077-A272-B1C457B56BE2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MathSample", "MathSample\MathSample.xproj", "{14663874-4207-4AD4-B679-C39AEAC74290}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathSample", "MathSample\MathSample.csproj", "{14663874-4207-4AD4-B679-C39AEAC74290}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,36 +29,36 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Release|Any CPU.Build.0 = Release|Any CPU + {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {CD9E03D0-CA31-4F35-A1FC-FC64FD0E35A8}.Release|Any CPU.Build.0 = Debug|Any CPU {B4C41669-D700-4455-AC65-54370F1113E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4C41669-D700-4455-AC65-54370F1113E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4C41669-D700-4455-AC65-54370F1113E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4C41669-D700-4455-AC65-54370F1113E8}.Release|Any CPU.Build.0 = Release|Any CPU + {B4C41669-D700-4455-AC65-54370F1113E8}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {B4C41669-D700-4455-AC65-54370F1113E8}.Release|Any CPU.Build.0 = Debug|Any CPU {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Release|Any CPU.Build.0 = Release|Any CPU + {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {210D38EB-2A2A-40E7-9F5D-29AF7E519B67}.Release|Any CPU.Build.0 = Debug|Any CPU {113847B7-E2D3-4067-963B-ACE282849CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {113847B7-E2D3-4067-963B-ACE282849CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {113847B7-E2D3-4067-963B-ACE282849CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {113847B7-E2D3-4067-963B-ACE282849CEF}.Release|Any CPU.Build.0 = Release|Any CPU + {113847B7-E2D3-4067-963B-ACE282849CEF}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {113847B7-E2D3-4067-963B-ACE282849CEF}.Release|Any CPU.Build.0 = Debug|Any CPU {756F6933-3356-4AA8-855D-61D44A9230FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {756F6933-3356-4AA8-855D-61D44A9230FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {756F6933-3356-4AA8-855D-61D44A9230FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {756F6933-3356-4AA8-855D-61D44A9230FD}.Release|Any CPU.Build.0 = Release|Any CPU + {756F6933-3356-4AA8-855D-61D44A9230FD}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {756F6933-3356-4AA8-855D-61D44A9230FD}.Release|Any CPU.Build.0 = Debug|Any CPU {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Release|Any CPU.Build.0 = Release|Any CPU + {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {82BA4925-EE3B-46D4-84BA-D0DC228F3EED}.Release|Any CPU.Build.0 = Debug|Any CPU {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Release|Any CPU.Build.0 = Release|Any CPU + {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {EB534C37-1EFA-4077-A272-B1C457B56BE2}.Release|Any CPU.Build.0 = Debug|Any CPU {14663874-4207-4AD4-B679-C39AEAC74290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14663874-4207-4AD4-B679-C39AEAC74290}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14663874-4207-4AD4-B679-C39AEAC74290}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14663874-4207-4AD4-B679-C39AEAC74290}.Release|Any CPU.Build.0 = Release|Any CPU + {14663874-4207-4AD4-B679-C39AEAC74290}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {14663874-4207-4AD4-B679-C39AEAC74290}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.csproj new file mode 100644 index 00000000..76a034dd --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + OutKeywordSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.xproj deleted file mode 100644 index 954fad7b..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/OutKeywordSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 82ba4925-ee3b-46d4-84ba-d0dc228f3eed - OutKeywordSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/OutKeywordSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndByReference.xproj b/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndByReference.xproj deleted file mode 100644 index 9f03c3cb..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndByReference.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cd9e03d0-ca31-4f35-a1fc-fc64fd0e35a8 - PassingByValueAndReference - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndReference.csproj b/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndReference.csproj new file mode 100644 index 00000000..98f31e8b --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/PassingByValueAndReference.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + PassingByValueAndReference + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/project.json b/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/PassingByValueAndReference/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.csproj new file mode 100644 index 00000000..82fbdccd --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + StaticConstructorSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.xproj deleted file mode 100644 index 7326f414..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/StaticConstructorSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 113847b7-e2d3-4067-963b-ace282849cef - StaticConstructorSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/StaticConstructorSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.csproj b/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.csproj new file mode 100644 index 00000000..b1afbace --- /dev/null +++ b/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + StructsSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.xproj b/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.xproj deleted file mode 100644 index 2c864cb4..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/StructsSample/StructsSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 756f6933-3356-4aa8-855d-61d44a9230fd - StructsSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ObjectsAndTypes/ObjectsAndTypes/StructsSample/project.json b/ObjectsAndTypes/ObjectsAndTypes/StructsSample/project.json deleted file mode 100644 index d21d36c2..00000000 --- a/ObjectsAndTypes/ObjectsAndTypes/StructsSample/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From a8b605b2b319035215064b65532a915969e4b5ea Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 18:01:06 +0100 Subject: [PATCH 05/90] MSBuild .NET Core 1.1 #27 --- .../InheritanceSamples/InheritanceSamples.sln | 24 ++++++------- .../InheritanceWithConstructors.csproj | 35 +++++++++++++++++++ .../InheritanceWithConstructors.xproj | 18 ---------- .../InheritanceWithConstructors/project.json | 21 ----------- .../UsingInterfaces/UsingInterfaces.csproj | 35 +++++++++++++++++++ .../UsingInterfaces/UsingInterfaces.xproj | 18 ---------- .../UsingInterfaces/project.json | 21 ----------- .../VirtualMethods/VirtualMethods.csproj | 35 +++++++++++++++++++ .../VirtualMethods/VirtualMethods.xproj | 18 ---------- .../VirtualMethods/project.json | 21 ----------- 10 files changed, 117 insertions(+), 129 deletions(-) create mode 100644 Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.csproj delete mode 100644 Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.xproj delete mode 100644 Inheritance/InheritanceSamples/InheritanceWithConstructors/project.json create mode 100644 Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.csproj delete mode 100644 Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.xproj delete mode 100644 Inheritance/InheritanceSamples/UsingInterfaces/project.json create mode 100644 Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.csproj delete mode 100644 Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.xproj delete mode 100644 Inheritance/InheritanceSamples/VirtualMethods/project.json diff --git a/Inheritance/InheritanceSamples/InheritanceSamples.sln b/Inheritance/InheritanceSamples/InheritanceSamples.sln index de086948..c387f7fc 100644 --- a/Inheritance/InheritanceSamples/InheritanceSamples.sln +++ b/Inheritance/InheritanceSamples/InheritanceSamples.sln @@ -1,15 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "InheritanceWithConstructors", "InheritanceWithConstructors\InheritanceWithConstructors.xproj", "{9ECE18EA-254C-4612-A707-CADFDB72C7BE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E19D0727-9B62-45F1-97DE-FEF79F867A0F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UsingInterfaces", "UsingInterfaces\UsingInterfaces.xproj", "{F001FAAE-8D5A-42DD-A462-2DF34388824F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InheritanceWithConstructors", "InheritanceWithConstructors\InheritanceWithConstructors.csproj", "{9ECE18EA-254C-4612-A707-CADFDB72C7BE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VirtualMethods", "VirtualMethods\VirtualMethods.xproj", "{4201F568-F58B-49B3-B184-B0E4F14F8724}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsingInterfaces", "UsingInterfaces\UsingInterfaces.csproj", "{F001FAAE-8D5A-42DD-A462-2DF34388824F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E19D0727-9B62-45F1-97DE-FEF79F867A0F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualMethods", "VirtualMethods\VirtualMethods.csproj", "{4201F568-F58B-49B3-B184-B0E4F14F8724}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,16 +19,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Release|Any CPU.Build.0 = Release|Any CPU + {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {9ECE18EA-254C-4612-A707-CADFDB72C7BE}.Release|Any CPU.Build.0 = Debug|Any CPU {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Release|Any CPU.Build.0 = Release|Any CPU + {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {F001FAAE-8D5A-42DD-A462-2DF34388824F}.Release|Any CPU.Build.0 = Debug|Any CPU {4201F568-F58B-49B3-B184-B0E4F14F8724}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4201F568-F58B-49B3-B184-B0E4F14F8724}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4201F568-F58B-49B3-B184-B0E4F14F8724}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4201F568-F58B-49B3-B184-B0E4F14F8724}.Release|Any CPU.Build.0 = Release|Any CPU + {4201F568-F58B-49B3-B184-B0E4F14F8724}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {4201F568-F58B-49B3-B184-B0E4F14F8724}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.csproj b/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.csproj new file mode 100644 index 00000000..55e93477 --- /dev/null +++ b/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + InheritanceWithConstructors + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.xproj b/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.xproj deleted file mode 100644 index 8aa63bb8..00000000 --- a/Inheritance/InheritanceSamples/InheritanceWithConstructors/InheritanceWithConstructors.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9ece18ea-254c-4612-a707-cadfdb72c7be - InheritanceWithConstructors - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/InheritanceWithConstructors/project.json b/Inheritance/InheritanceSamples/InheritanceWithConstructors/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Inheritance/InheritanceSamples/InheritanceWithConstructors/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.csproj b/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.csproj new file mode 100644 index 00000000..cca587d7 --- /dev/null +++ b/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + UsingInterfaces + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.xproj b/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.xproj deleted file mode 100644 index e5949eec..00000000 --- a/Inheritance/InheritanceSamples/UsingInterfaces/UsingInterfaces.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f001faae-8d5a-42dd-a462-2df34388824f - UsingInterfaces - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/UsingInterfaces/project.json b/Inheritance/InheritanceSamples/UsingInterfaces/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Inheritance/InheritanceSamples/UsingInterfaces/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.csproj b/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.csproj new file mode 100644 index 00000000..0a390e7c --- /dev/null +++ b/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + VirtualMethods + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.xproj b/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.xproj deleted file mode 100644 index 9140d18d..00000000 --- a/Inheritance/InheritanceSamples/VirtualMethods/VirtualMethods.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4201f568-f58b-49b3-b184-b0e4f14f8724 - VirtualMethods - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Inheritance/InheritanceSamples/VirtualMethods/project.json b/Inheritance/InheritanceSamples/VirtualMethods/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Inheritance/InheritanceSamples/VirtualMethods/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 009589c37fd388b31f35847f52231094ef0d6d93 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 18:01:52 +0100 Subject: [PATCH 06/90] MSBuild .NET Core 1.1 #27 --- .../ArraySegmentSample.csproj | 41 +++++++++++++++++++ .../ArraySegmentSample.xproj | 18 -------- .../ArraySegmentSample/project.json | 21 ---------- .../SimpleArrays/SimpleArrays.csproj | 41 +++++++++++++++++++ .../SimpleArrays/SimpleArrays.xproj | 18 -------- .../ArraysSamples/SimpleArrays/project.json | 21 ---------- .../SortingSample/SortingSample.csproj | 41 +++++++++++++++++++ .../SortingSample/SortingSample.xproj | 18 -------- .../ArraysSamples/SortingSample/project.json | 21 ---------- .../StructuralComparison.csproj | 41 +++++++++++++++++++ .../StructuralComparison.xproj | 18 -------- .../StructuralComparison/project.json | 21 ---------- .../TuplesSample/TuplesSample.csproj | 41 +++++++++++++++++++ .../TuplesSample/TuplesSample.xproj | 18 -------- .../ArraysSamples/TuplesSample/project.json | 21 ---------- .../YieldSample/YieldSample.csproj | 41 +++++++++++++++++++ .../YieldSample/YieldSample.xproj | 18 -------- Arrays/ArraysSamples/YieldSample/project.json | 21 ---------- 18 files changed, 246 insertions(+), 234 deletions(-) create mode 100644 Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.csproj delete mode 100644 Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.xproj delete mode 100644 Arrays/ArraysSamples/ArraySegmentSample/project.json create mode 100644 Arrays/ArraysSamples/SimpleArrays/SimpleArrays.csproj delete mode 100644 Arrays/ArraysSamples/SimpleArrays/SimpleArrays.xproj delete mode 100644 Arrays/ArraysSamples/SimpleArrays/project.json create mode 100644 Arrays/ArraysSamples/SortingSample/SortingSample.csproj delete mode 100644 Arrays/ArraysSamples/SortingSample/SortingSample.xproj delete mode 100644 Arrays/ArraysSamples/SortingSample/project.json create mode 100644 Arrays/ArraysSamples/StructuralComparison/StructuralComparison.csproj delete mode 100644 Arrays/ArraysSamples/StructuralComparison/StructuralComparison.xproj delete mode 100644 Arrays/ArraysSamples/StructuralComparison/project.json create mode 100644 Arrays/ArraysSamples/TuplesSample/TuplesSample.csproj delete mode 100644 Arrays/ArraysSamples/TuplesSample/TuplesSample.xproj delete mode 100644 Arrays/ArraysSamples/TuplesSample/project.json create mode 100644 Arrays/ArraysSamples/YieldSample/YieldSample.csproj delete mode 100644 Arrays/ArraysSamples/YieldSample/YieldSample.xproj delete mode 100644 Arrays/ArraysSamples/YieldSample/project.json diff --git a/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.csproj b/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.csproj new file mode 100644 index 00000000..8c2ba244 --- /dev/null +++ b/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + ArraySegmentSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.xproj b/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.xproj deleted file mode 100644 index 94747c1f..00000000 --- a/Arrays/ArraysSamples/ArraySegmentSample/ArraySegmentSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 175ad318-cae9-4360-acdb-c50308cc7ebc - ArraySegmentSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/ArraySegmentSample/project.json b/Arrays/ArraysSamples/ArraySegmentSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/ArraySegmentSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.csproj b/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.csproj new file mode 100644 index 00000000..026b5a40 --- /dev/null +++ b/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + SimpleArrays + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.xproj b/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.xproj deleted file mode 100644 index 9a745b9f..00000000 --- a/Arrays/ArraysSamples/SimpleArrays/SimpleArrays.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ddd7f301-b368-431b-9421-a2340dbc9a87 - SimpleArrays - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/SimpleArrays/project.json b/Arrays/ArraysSamples/SimpleArrays/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/SimpleArrays/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Arrays/ArraysSamples/SortingSample/SortingSample.csproj b/Arrays/ArraysSamples/SortingSample/SortingSample.csproj new file mode 100644 index 00000000..5750873f --- /dev/null +++ b/Arrays/ArraysSamples/SortingSample/SortingSample.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + SortingSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/SortingSample/SortingSample.xproj b/Arrays/ArraysSamples/SortingSample/SortingSample.xproj deleted file mode 100644 index f04a641c..00000000 --- a/Arrays/ArraysSamples/SortingSample/SortingSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c6154cfc-483c-4ba6-9a7e-00926bb2b0e0 - SortingSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/SortingSample/project.json b/Arrays/ArraysSamples/SortingSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/SortingSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.csproj b/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.csproj new file mode 100644 index 00000000..d14c35e2 --- /dev/null +++ b/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + StructuralComparison + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.xproj b/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.xproj deleted file mode 100644 index 34f69d5f..00000000 --- a/Arrays/ArraysSamples/StructuralComparison/StructuralComparison.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 91006021-9793-4feb-94f3-c5ba58bd985d - StructuralComparison - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/StructuralComparison/project.json b/Arrays/ArraysSamples/StructuralComparison/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/StructuralComparison/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Arrays/ArraysSamples/TuplesSample/TuplesSample.csproj b/Arrays/ArraysSamples/TuplesSample/TuplesSample.csproj new file mode 100644 index 00000000..9ff710cd --- /dev/null +++ b/Arrays/ArraysSamples/TuplesSample/TuplesSample.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + TuplesSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/TuplesSample/TuplesSample.xproj b/Arrays/ArraysSamples/TuplesSample/TuplesSample.xproj deleted file mode 100644 index bc4c2db7..00000000 --- a/Arrays/ArraysSamples/TuplesSample/TuplesSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8c33a240-4eb9-4715-a27c-5782afb4d59d - TuplesSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/TuplesSample/project.json b/Arrays/ArraysSamples/TuplesSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/TuplesSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Arrays/ArraysSamples/YieldSample/YieldSample.csproj b/Arrays/ArraysSamples/YieldSample/YieldSample.csproj new file mode 100644 index 00000000..41b4c27c --- /dev/null +++ b/Arrays/ArraysSamples/YieldSample/YieldSample.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + YieldSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Arrays/ArraysSamples/YieldSample/YieldSample.xproj b/Arrays/ArraysSamples/YieldSample/YieldSample.xproj deleted file mode 100644 index d1efc0ad..00000000 --- a/Arrays/ArraysSamples/YieldSample/YieldSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f0ddc811-fe25-4618-9860-bc77546c0391 - YieldSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Arrays/ArraysSamples/YieldSample/project.json b/Arrays/ArraysSamples/YieldSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Arrays/ArraysSamples/YieldSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From cbc7de87bccfb87433886341e47408e536df3be1 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 18:07:09 +0100 Subject: [PATCH 07/90] MSBuild .NET Core 1.1 #27 --- .../CastingSample/CastingSample.csproj | 35 +++++++++++++++++++ .../CastingSample/CastingSample.xproj | 18 ---------- .../CastingSample/project.json | 21 ----------- .../CustomIndexerSample.csproj | 35 +++++++++++++++++++ .../CustomIndexerSample.xproj | 18 ---------- .../CustomIndexerSample/project.json | 21 ----------- .../OperatorOverloadingSample.csproj | 35 +++++++++++++++++++ .../OperatorOverloadingSample.xproj | 18 ---------- .../OperatorOverloadingSample/project.json | 21 ----------- .../OperatorOverloadingSample2.csproj | 35 +++++++++++++++++++ .../OperatorOverloadingSample2.xproj | 18 ---------- .../OperatorOverloadingSample2/project.json | 21 ----------- .../OperatorsAndCasts/OperatorsAndCasts.sln | 34 +++++++++--------- .../OverloadingComparisonSample.csproj | 35 +++++++++++++++++++ .../OverloadingComparisonSample.xproj | 18 ---------- .../OverloadingComparisonSample/project.json | 21 ----------- 16 files changed, 192 insertions(+), 212 deletions(-) create mode 100644 OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.csproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.xproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/CastingSample/project.json create mode 100644 OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.csproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.xproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/project.json create mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.csproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.xproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/project.json create mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.csproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.xproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/project.json create mode 100644 OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.csproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.xproj delete mode 100644 OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/project.json diff --git a/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.csproj b/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.csproj new file mode 100644 index 00000000..081e0aad --- /dev/null +++ b/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + CastingSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.xproj b/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.xproj deleted file mode 100644 index 10ef6845..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/CastingSample/CastingSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d082a5c0-c484-40e4-961b-262a3652fd8f - CastingSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/CastingSample/project.json b/OperatorsAndCasts/OperatorsAndCasts/CastingSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/CastingSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.csproj b/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.csproj new file mode 100644 index 00000000..a92eb470 --- /dev/null +++ b/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + CustomIndexerSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.xproj b/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.xproj deleted file mode 100644 index 76d6447d..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/CustomIndexerSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bf8676e3-425d-45b2-b5d8-778a58a1a2be - CustomIndexerSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/project.json b/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/CustomIndexerSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.csproj b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.csproj new file mode 100644 index 00000000..db74c513 --- /dev/null +++ b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + OperatorOverloadingSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.xproj b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.xproj deleted file mode 100644 index 78cb0a49..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/OperatorOverloadingSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9ea79034-e7e3-400d-974e-cd9309480802 - OperatorOverloadingSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/project.json b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.csproj b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.csproj new file mode 100644 index 00000000..f990dffb --- /dev/null +++ b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + OperatorOverloadingSample2 + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.xproj b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.xproj deleted file mode 100644 index 9134ba7f..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/OperatorOverloadingSample2.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 43d3426d-3ab4-4c4d-92a2-4554aa903129 - OperatorOverloadingSample2 - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/project.json b/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OperatorOverloadingSample2/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/OperatorsAndCasts/OperatorsAndCasts/OperatorsAndCasts.sln b/OperatorsAndCasts/OperatorsAndCasts/OperatorsAndCasts.sln index 2af0b35e..1e69e818 100644 --- a/OperatorsAndCasts/OperatorsAndCasts/OperatorsAndCasts.sln +++ b/OperatorsAndCasts/OperatorsAndCasts/OperatorsAndCasts.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CastingSample", "CastingSample\CastingSample.xproj", "{D082A5C0-C484-40E4-961B-262A3652FD8F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CastingSample", "CastingSample\CastingSample.csproj", "{D082A5C0-C484-40E4-961B-262A3652FD8F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CustomIndexerSample", "CustomIndexerSample\CustomIndexerSample.xproj", "{BF8676E3-425D-45B2-B5D8-778A58A1A2BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomIndexerSample", "CustomIndexerSample\CustomIndexerSample.csproj", "{BF8676E3-425D-45B2-B5D8-778A58A1A2BE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OperatorOverloadingSample", "OperatorOverloadingSample\OperatorOverloadingSample.xproj", "{9EA79034-E7E3-400D-974E-CD9309480802}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OperatorOverloadingSample", "OperatorOverloadingSample\OperatorOverloadingSample.csproj", "{9EA79034-E7E3-400D-974E-CD9309480802}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OperatorOverloadingSample2", "OperatorOverloadingSample2\OperatorOverloadingSample2.xproj", "{43D3426D-3AB4-4C4D-92A2-4554AA903129}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OperatorOverloadingSample2", "OperatorOverloadingSample2\OperatorOverloadingSample2.csproj", "{43D3426D-3AB4-4C4D-92A2-4554AA903129}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OverloadingComparisonSample", "OverloadingComparisonSample\OverloadingComparisonSample.xproj", "{ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverloadingComparisonSample", "OverloadingComparisonSample\OverloadingComparisonSample.csproj", "{ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,24 +21,24 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {D082A5C0-C484-40E4-961B-262A3652FD8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D082A5C0-C484-40E4-961B-262A3652FD8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D082A5C0-C484-40E4-961B-262A3652FD8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D082A5C0-C484-40E4-961B-262A3652FD8F}.Release|Any CPU.Build.0 = Release|Any CPU + {D082A5C0-C484-40E4-961B-262A3652FD8F}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {D082A5C0-C484-40E4-961B-262A3652FD8F}.Release|Any CPU.Build.0 = Debug|Any CPU {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Release|Any CPU.Build.0 = Release|Any CPU + {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {BF8676E3-425D-45B2-B5D8-778A58A1A2BE}.Release|Any CPU.Build.0 = Debug|Any CPU {9EA79034-E7E3-400D-974E-CD9309480802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EA79034-E7E3-400D-974E-CD9309480802}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EA79034-E7E3-400D-974E-CD9309480802}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EA79034-E7E3-400D-974E-CD9309480802}.Release|Any CPU.Build.0 = Release|Any CPU + {9EA79034-E7E3-400D-974E-CD9309480802}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {9EA79034-E7E3-400D-974E-CD9309480802}.Release|Any CPU.Build.0 = Debug|Any CPU {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Release|Any CPU.Build.0 = Release|Any CPU + {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {43D3426D-3AB4-4C4D-92A2-4554AA903129}.Release|Any CPU.Build.0 = Debug|Any CPU {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Release|Any CPU.Build.0 = Release|Any CPU + {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {ACB638D6-4F2A-4AEA-A850-BEC636DB21F8}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.csproj b/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.csproj new file mode 100644 index 00000000..e2543b18 --- /dev/null +++ b/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + OverloadingComparisonSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.xproj b/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.xproj deleted file mode 100644 index 5a7a9756..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/OverloadingComparisonSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - acb638d6-4f2a-4aea-a850-bec636db21f8 - OverloadingComparisonSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/project.json b/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/OperatorsAndCasts/OperatorsAndCasts/OverloadingComparisonSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From fdeeb9505a77c4546f4add1d544242e97a34565f Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 20:03:06 +0100 Subject: [PATCH 08/90] MSBuild .NET Core 1.1 #27 --- .../RegularExpressionPlayground.csproj | 35 +++++++++++++++++++ .../RegularExpressionPlayground.xproj | 18 ---------- .../RegularExpressionPlayground/project.json | 21 ----------- .../StringFormats/StringFormats.csproj | 35 +++++++++++++++++++ .../StringFormats/StringFormats.xproj | 18 ---------- .../StringFormats/project.json | 21 ----------- .../StringSample/StringSample.csproj | 35 +++++++++++++++++++ .../StringSample/StringSample.xproj | 18 ---------- .../StringSample/project.json | 21 ----------- .../StringsAndRegularExpressions.sln | 22 ++++++------ 10 files changed, 116 insertions(+), 128 deletions(-) create mode 100644 StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.csproj delete mode 100644 StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.xproj delete mode 100644 StringsAndRegularExpressions/RegularExpressionPlayground/project.json create mode 100644 StringsAndRegularExpressions/StringFormats/StringFormats.csproj delete mode 100644 StringsAndRegularExpressions/StringFormats/StringFormats.xproj delete mode 100644 StringsAndRegularExpressions/StringFormats/project.json create mode 100644 StringsAndRegularExpressions/StringSample/StringSample.csproj delete mode 100644 StringsAndRegularExpressions/StringSample/StringSample.xproj delete mode 100644 StringsAndRegularExpressions/StringSample/project.json diff --git a/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.csproj b/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.csproj new file mode 100644 index 00000000..f34f8aab --- /dev/null +++ b/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + RegularExpressionPlayground + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.xproj b/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.xproj deleted file mode 100644 index de172626..00000000 --- a/StringsAndRegularExpressions/RegularExpressionPlayground/RegularExpressionPlayground.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fdb57e81-78c1-41a1-9f4b-b695155f6a4e - RegularExpressionPlayground - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/StringsAndRegularExpressions/RegularExpressionPlayground/project.json b/StringsAndRegularExpressions/RegularExpressionPlayground/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/StringsAndRegularExpressions/RegularExpressionPlayground/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/StringsAndRegularExpressions/StringFormats/StringFormats.csproj b/StringsAndRegularExpressions/StringFormats/StringFormats.csproj new file mode 100644 index 00000000..b240cbb1 --- /dev/null +++ b/StringsAndRegularExpressions/StringFormats/StringFormats.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + StringFormats + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/StringsAndRegularExpressions/StringFormats/StringFormats.xproj b/StringsAndRegularExpressions/StringFormats/StringFormats.xproj deleted file mode 100644 index 9c799458..00000000 --- a/StringsAndRegularExpressions/StringFormats/StringFormats.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 744db046-054e-44ee-9062-7e0fc9f29a20 - StringFormats - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/StringsAndRegularExpressions/StringFormats/project.json b/StringsAndRegularExpressions/StringFormats/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/StringsAndRegularExpressions/StringFormats/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/StringsAndRegularExpressions/StringSample/StringSample.csproj b/StringsAndRegularExpressions/StringSample/StringSample.csproj new file mode 100644 index 00000000..6ebbbf49 --- /dev/null +++ b/StringsAndRegularExpressions/StringSample/StringSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + StringSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/StringsAndRegularExpressions/StringSample/StringSample.xproj b/StringsAndRegularExpressions/StringSample/StringSample.xproj deleted file mode 100644 index a6c6253d..00000000 --- a/StringsAndRegularExpressions/StringSample/StringSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d23b5464-610b-4dbf-a209-d9a712e9faa4 - StringSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/StringsAndRegularExpressions/StringSample/project.json b/StringsAndRegularExpressions/StringSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/StringsAndRegularExpressions/StringSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/StringsAndRegularExpressions/StringsAndRegularExpressions.sln b/StringsAndRegularExpressions/StringsAndRegularExpressions.sln index ab32fc24..cd0b67e7 100644 --- a/StringsAndRegularExpressions/StringsAndRegularExpressions.sln +++ b/StringsAndRegularExpressions/StringsAndRegularExpressions.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24627.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StringSample", "StringSample\StringSample.xproj", "{D23B5464-610B-4DBF-A209-D9A712E9FAA4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StringSample", "StringSample\StringSample.csproj", "{D23B5464-610B-4DBF-A209-D9A712E9FAA4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StringFormats", "StringFormats\StringFormats.xproj", "{744DB046-054E-44EE-9062-7E0FC9F29A20}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StringFormats", "StringFormats\StringFormats.csproj", "{744DB046-054E-44EE-9062-7E0FC9F29A20}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RegularExpressionPlayground", "RegularExpressionPlayground\RegularExpressionPlayground.xproj", "{FDB57E81-78C1-41A1-9F4B-B695155F6A4E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegularExpressionPlayground", "RegularExpressionPlayground\RegularExpressionPlayground.csproj", "{FDB57E81-78C1-41A1-9F4B-B695155F6A4E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,16 +17,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Release|Any CPU.Build.0 = Release|Any CPU + {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {D23B5464-610B-4DBF-A209-D9A712E9FAA4}.Release|Any CPU.Build.0 = Debug|Any CPU {744DB046-054E-44EE-9062-7E0FC9F29A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {744DB046-054E-44EE-9062-7E0FC9F29A20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {744DB046-054E-44EE-9062-7E0FC9F29A20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {744DB046-054E-44EE-9062-7E0FC9F29A20}.Release|Any CPU.Build.0 = Release|Any CPU + {744DB046-054E-44EE-9062-7E0FC9F29A20}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {744DB046-054E-44EE-9062-7E0FC9F29A20}.Release|Any CPU.Build.0 = Debug|Any CPU {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Release|Any CPU.Build.0 = Release|Any CPU + {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {FDB57E81-78C1-41A1-9F4B-B695155F6A4E}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 50321e41eb632ee6770b3a26f4e25494c123d17d Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 20:30:57 +0100 Subject: [PATCH 09/90] MSBuild .NET Core 1.1 #27 --- Collections/Collections.sln | 52 +++++++++---------- .../DictionarySample/DictionarySample.csproj | 35 +++++++++++++ .../DictionarySample/DictionarySample.xproj | 18 ------- Collections/DictionarySample/project.json | 21 -------- .../LinkedListSample/LinkedListSample.csproj | 35 +++++++++++++ .../LinkedListSample/LinkedListSample.xproj | 18 ------- Collections/LinkedListSample/project.json | 21 -------- Collections/ListSamples/ListSamples.csproj | 35 +++++++++++++ Collections/ListSamples/ListSamples.xproj | 18 ------- Collections/ListSamples/project.json | 21 -------- Collections/LookupSample/LookupSample.csproj | 35 +++++++++++++ Collections/LookupSample/LookupSample.xproj | 18 ------- Collections/LookupSample/project.json | 21 -------- Collections/QueueSample/QueueSample.csproj | 35 +++++++++++++ Collections/QueueSample/QueueSample.xproj | 18 ------- Collections/QueueSample/project.json | 21 -------- Collections/SetSample/SetSample.csproj | 35 +++++++++++++ Collections/SetSample/SetSample.xproj | 18 ------- Collections/SetSample/project.json | 21 -------- .../SortedListSample/SortedListSample.csproj | 35 +++++++++++++ .../SortedListSample/SortedListSample.xproj | 18 ------- Collections/SortedListSample/project.json | 21 -------- Collections/StackSample/StackSample.csproj | 35 +++++++++++++ Collections/StackSample/StackSample.xproj | 18 ------- Collections/StackSample/project.json | 21 -------- 25 files changed, 306 insertions(+), 338 deletions(-) create mode 100644 Collections/DictionarySample/DictionarySample.csproj delete mode 100644 Collections/DictionarySample/DictionarySample.xproj delete mode 100644 Collections/DictionarySample/project.json create mode 100644 Collections/LinkedListSample/LinkedListSample.csproj delete mode 100644 Collections/LinkedListSample/LinkedListSample.xproj delete mode 100644 Collections/LinkedListSample/project.json create mode 100644 Collections/ListSamples/ListSamples.csproj delete mode 100644 Collections/ListSamples/ListSamples.xproj delete mode 100644 Collections/ListSamples/project.json create mode 100644 Collections/LookupSample/LookupSample.csproj delete mode 100644 Collections/LookupSample/LookupSample.xproj delete mode 100644 Collections/LookupSample/project.json create mode 100644 Collections/QueueSample/QueueSample.csproj delete mode 100644 Collections/QueueSample/QueueSample.xproj delete mode 100644 Collections/QueueSample/project.json create mode 100644 Collections/SetSample/SetSample.csproj delete mode 100644 Collections/SetSample/SetSample.xproj delete mode 100644 Collections/SetSample/project.json create mode 100644 Collections/SortedListSample/SortedListSample.csproj delete mode 100644 Collections/SortedListSample/SortedListSample.xproj delete mode 100644 Collections/SortedListSample/project.json create mode 100644 Collections/StackSample/StackSample.csproj delete mode 100644 Collections/StackSample/StackSample.xproj delete mode 100644 Collections/StackSample/project.json diff --git a/Collections/Collections.sln b/Collections/Collections.sln index 8d67be4b..ae788a77 100644 --- a/Collections/Collections.sln +++ b/Collections/Collections.sln @@ -1,23 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24627.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DictionarySample", "DictionarySample\DictionarySample.xproj", "{F5A695B5-2A78-4425-B2C4-1501AE70A570}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DictionarySample", "DictionarySample\DictionarySample.csproj", "{F5A695B5-2A78-4425-B2C4-1501AE70A570}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinkedListSample", "LinkedListSample\LinkedListSample.xproj", "{51B8586B-5E63-4802-AF0F-9A7007A7BE71}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkedListSample", "LinkedListSample\LinkedListSample.csproj", "{51B8586B-5E63-4802-AF0F-9A7007A7BE71}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ListSamples", "ListSamples\ListSamples.xproj", "{679ECC52-8AF4-428C-9247-BA0F701F173F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ListSamples", "ListSamples\ListSamples.csproj", "{679ECC52-8AF4-428C-9247-BA0F701F173F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LookupSample", "LookupSample\LookupSample.xproj", "{4A41754F-2F66-400C-88F6-14BDB454B527}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LookupSample", "LookupSample\LookupSample.csproj", "{4A41754F-2F66-400C-88F6-14BDB454B527}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "QueueSample", "QueueSample\QueueSample.xproj", "{7A1D4316-95C1-414D-B6CC-C3725F485CD0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueueSample", "QueueSample\QueueSample.csproj", "{7A1D4316-95C1-414D-B6CC-C3725F485CD0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SetSample", "SetSample\SetSample.xproj", "{EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetSample", "SetSample\SetSample.csproj", "{EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SortedListSample", "SortedListSample\SortedListSample.xproj", "{25B6DAA6-0528-4023-ADDF-65CC3D7C988A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SortedListSample", "SortedListSample\SortedListSample.csproj", "{25B6DAA6-0528-4023-ADDF-65CC3D7C988A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackSample", "StackSample\StackSample.xproj", "{BDBB353D-6022-406B-ADA8-EB11EC478AED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackSample", "StackSample\StackSample.csproj", "{BDBB353D-6022-406B-ADA8-EB11EC478AED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,36 +27,36 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Release|Any CPU.Build.0 = Release|Any CPU + {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {F5A695B5-2A78-4425-B2C4-1501AE70A570}.Release|Any CPU.Build.0 = Debug|Any CPU {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Release|Any CPU.Build.0 = Release|Any CPU + {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {51B8586B-5E63-4802-AF0F-9A7007A7BE71}.Release|Any CPU.Build.0 = Debug|Any CPU {679ECC52-8AF4-428C-9247-BA0F701F173F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {679ECC52-8AF4-428C-9247-BA0F701F173F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {679ECC52-8AF4-428C-9247-BA0F701F173F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {679ECC52-8AF4-428C-9247-BA0F701F173F}.Release|Any CPU.Build.0 = Release|Any CPU + {679ECC52-8AF4-428C-9247-BA0F701F173F}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {679ECC52-8AF4-428C-9247-BA0F701F173F}.Release|Any CPU.Build.0 = Debug|Any CPU {4A41754F-2F66-400C-88F6-14BDB454B527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A41754F-2F66-400C-88F6-14BDB454B527}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A41754F-2F66-400C-88F6-14BDB454B527}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A41754F-2F66-400C-88F6-14BDB454B527}.Release|Any CPU.Build.0 = Release|Any CPU + {4A41754F-2F66-400C-88F6-14BDB454B527}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {4A41754F-2F66-400C-88F6-14BDB454B527}.Release|Any CPU.Build.0 = Debug|Any CPU {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Release|Any CPU.Build.0 = Release|Any CPU + {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {7A1D4316-95C1-414D-B6CC-C3725F485CD0}.Release|Any CPU.Build.0 = Debug|Any CPU {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Release|Any CPU.Build.0 = Release|Any CPU + {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {EBF7700C-9DC9-47E0-9AAA-F7BB9D9B6EEB}.Release|Any CPU.Build.0 = Debug|Any CPU {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Release|Any CPU.Build.0 = Release|Any CPU + {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {25B6DAA6-0528-4023-ADDF-65CC3D7C988A}.Release|Any CPU.Build.0 = Debug|Any CPU {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {BDBB353D-6022-406B-ADA8-EB11EC478AED}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Collections/DictionarySample/DictionarySample.csproj b/Collections/DictionarySample/DictionarySample.csproj new file mode 100644 index 00000000..ebaca807 --- /dev/null +++ b/Collections/DictionarySample/DictionarySample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + DictionarySample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/DictionarySample/DictionarySample.xproj b/Collections/DictionarySample/DictionarySample.xproj deleted file mode 100644 index 823fdae1..00000000 --- a/Collections/DictionarySample/DictionarySample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f5a695b5-2a78-4425-b2c4-1501ae70a570 - DictionarySample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/DictionarySample/project.json b/Collections/DictionarySample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/DictionarySample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/LinkedListSample/LinkedListSample.csproj b/Collections/LinkedListSample/LinkedListSample.csproj new file mode 100644 index 00000000..ecd4c162 --- /dev/null +++ b/Collections/LinkedListSample/LinkedListSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + LinkedListSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/LinkedListSample/LinkedListSample.xproj b/Collections/LinkedListSample/LinkedListSample.xproj deleted file mode 100644 index a22521e7..00000000 --- a/Collections/LinkedListSample/LinkedListSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 51b8586b-5e63-4802-af0f-9a7007a7be71 - LinkedListSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/LinkedListSample/project.json b/Collections/LinkedListSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/LinkedListSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/ListSamples/ListSamples.csproj b/Collections/ListSamples/ListSamples.csproj new file mode 100644 index 00000000..c9e3baef --- /dev/null +++ b/Collections/ListSamples/ListSamples.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + ListSamples + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/ListSamples/ListSamples.xproj b/Collections/ListSamples/ListSamples.xproj deleted file mode 100644 index b97b35d1..00000000 --- a/Collections/ListSamples/ListSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 679ecc52-8af4-428c-9247-ba0f701f173f - ListSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/ListSamples/project.json b/Collections/ListSamples/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/ListSamples/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/LookupSample/LookupSample.csproj b/Collections/LookupSample/LookupSample.csproj new file mode 100644 index 00000000..de4fafe7 --- /dev/null +++ b/Collections/LookupSample/LookupSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + LookupSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/LookupSample/LookupSample.xproj b/Collections/LookupSample/LookupSample.xproj deleted file mode 100644 index 1f2c1c4e..00000000 --- a/Collections/LookupSample/LookupSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4a41754f-2f66-400c-88f6-14bdb454b527 - LookupSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/LookupSample/project.json b/Collections/LookupSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/LookupSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/QueueSample/QueueSample.csproj b/Collections/QueueSample/QueueSample.csproj new file mode 100644 index 00000000..37d92edf --- /dev/null +++ b/Collections/QueueSample/QueueSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + QueueSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/QueueSample/QueueSample.xproj b/Collections/QueueSample/QueueSample.xproj deleted file mode 100644 index 51020439..00000000 --- a/Collections/QueueSample/QueueSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7a1d4316-95c1-414d-b6cc-c3725f485cd0 - QueueSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/QueueSample/project.json b/Collections/QueueSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/QueueSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/SetSample/SetSample.csproj b/Collections/SetSample/SetSample.csproj new file mode 100644 index 00000000..062c86d5 --- /dev/null +++ b/Collections/SetSample/SetSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + SetSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/SetSample/SetSample.xproj b/Collections/SetSample/SetSample.xproj deleted file mode 100644 index 8061fed0..00000000 --- a/Collections/SetSample/SetSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ebf7700c-9dc9-47e0-9aaa-f7bb9d9b6eeb - SetSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/SetSample/project.json b/Collections/SetSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/SetSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/SortedListSample/SortedListSample.csproj b/Collections/SortedListSample/SortedListSample.csproj new file mode 100644 index 00000000..25e415e9 --- /dev/null +++ b/Collections/SortedListSample/SortedListSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + SortedListSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/SortedListSample/SortedListSample.xproj b/Collections/SortedListSample/SortedListSample.xproj deleted file mode 100644 index b14a376c..00000000 --- a/Collections/SortedListSample/SortedListSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 25b6daa6-0528-4023-addf-65cc3d7c988a - SortedListSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/SortedListSample/project.json b/Collections/SortedListSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/SortedListSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Collections/StackSample/StackSample.csproj b/Collections/StackSample/StackSample.csproj new file mode 100644 index 00000000..14ab03c9 --- /dev/null +++ b/Collections/StackSample/StackSample.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + StackSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Collections/StackSample/StackSample.xproj b/Collections/StackSample/StackSample.xproj deleted file mode 100644 index 748ad735..00000000 --- a/Collections/StackSample/StackSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bdbb353d-6022-406b-ada8-eb11ec478aed - StackSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Collections/StackSample/project.json b/Collections/StackSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Collections/StackSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 24b8a14f2f541485d260d9cab0d50452a1e04585 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Thu, 17 Nov 2016 20:40:29 +0100 Subject: [PATCH 10/90] MSBuild .NET Core 1.1 #27 --- .../BitArraySample/BitArraySample.csproj | 29 ++++++++++++++++ .../BitArraySample/BitArraySample.xproj | 18 ---------- .../BitArraySample/project.json | 21 ------------ .../BitVectorSample/BitVectorSample.csproj | 32 +++++++++++++++++ .../BitVectorSample/BitVectorSample.xproj | 18 ---------- .../BitVectorSample/project.json | 22 ------------ .../ImmutableCollectionSample.csproj | 29 ++++++++++++++++ .../ImmutableCollectionSample.xproj | 18 ---------- .../ImmutableCollectionSample/project.json | 21 ------------ .../ObservableCollectionSample.csproj | 29 ++++++++++++++++ .../ObservableCollectionSample.xproj | 18 ---------- .../ObservableCollectionSample/project.json | 21 ------------ .../PipelineSample/PipelineSample.csproj | 29 ++++++++++++++++ .../PipelineSample/PipelineSample.xproj | 21 ------------ .../PipelineSample/project.json | 21 ------------ .../SpecialCollections/SpecialCollections.sln | 34 +++++++++---------- 16 files changed, 165 insertions(+), 216 deletions(-) create mode 100644 SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.csproj delete mode 100644 SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.xproj delete mode 100644 SpecialCollections/SpecialCollections/BitArraySample/project.json create mode 100644 SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.csproj delete mode 100644 SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.xproj delete mode 100644 SpecialCollections/SpecialCollections/BitVectorSample/project.json create mode 100644 SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.csproj delete mode 100644 SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.xproj delete mode 100644 SpecialCollections/SpecialCollections/ImmutableCollectionSample/project.json create mode 100644 SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.csproj delete mode 100644 SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.xproj delete mode 100644 SpecialCollections/SpecialCollections/ObservableCollectionSample/project.json create mode 100644 SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.csproj delete mode 100644 SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.xproj delete mode 100644 SpecialCollections/SpecialCollections/PipelineSample/project.json diff --git a/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.csproj b/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.csproj new file mode 100644 index 00000000..d15a1b42 --- /dev/null +++ b/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + BitArraySample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.xproj b/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.xproj deleted file mode 100644 index ffe819d3..00000000 --- a/SpecialCollections/SpecialCollections/BitArraySample/BitArraySample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 50d1349e-2c95-43d8-bdc8-d0094fbcde1d - BitArraySample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/BitArraySample/project.json b/SpecialCollections/SpecialCollections/BitArraySample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/SpecialCollections/SpecialCollections/BitArraySample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.csproj b/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.csproj new file mode 100644 index 00000000..dafa5899 --- /dev/null +++ b/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.csproj @@ -0,0 +1,32 @@ + + + + netcoreapp1.0 + BitVectorSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + 4.3.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.xproj b/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.xproj deleted file mode 100644 index 91c97728..00000000 --- a/SpecialCollections/SpecialCollections/BitVectorSample/BitVectorSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6c46ada8-0e0f-41f4-a9fa-04b380c7b6c5 - BitVectorSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/BitVectorSample/project.json b/SpecialCollections/SpecialCollections/BitVectorSample/project.json deleted file mode 100644 index af3a7049..00000000 --- a/SpecialCollections/SpecialCollections/BitVectorSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Collections.Specialized": "4.0.1" - } - } - } -} diff --git a/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.csproj b/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.csproj new file mode 100644 index 00000000..2939e0c6 --- /dev/null +++ b/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + ImmutableCollectionSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.xproj b/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.xproj deleted file mode 100644 index 062daed4..00000000 --- a/SpecialCollections/SpecialCollections/ImmutableCollectionSample/ImmutableCollectionSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a477d3fe-3eb8-47c8-865a-cc21851a19a5 - ImmutableCollectionSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/ImmutableCollectionSample/project.json b/SpecialCollections/SpecialCollections/ImmutableCollectionSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/SpecialCollections/SpecialCollections/ImmutableCollectionSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.csproj b/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.csproj new file mode 100644 index 00000000..137eed3f --- /dev/null +++ b/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + ObservableCollectionSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.xproj b/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.xproj deleted file mode 100644 index 8fdf2bf0..00000000 --- a/SpecialCollections/SpecialCollections/ObservableCollectionSample/ObservableCollectionSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 60f92413-92e7-4754-bbf5-1ec8d3302cff - ObservableCollectionSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/ObservableCollectionSample/project.json b/SpecialCollections/SpecialCollections/ObservableCollectionSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/SpecialCollections/SpecialCollections/ObservableCollectionSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.csproj b/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.csproj new file mode 100644 index 00000000..339b6f0a --- /dev/null +++ b/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0 + PipelineSample + Exe + $(PackageTargetFallback);dnxcore50 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.xproj b/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.xproj deleted file mode 100644 index 99b0df33..00000000 --- a/SpecialCollections/SpecialCollections/PipelineSample/PipelineSample.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d5cbf2fd-05dc-4917-907c-4ecc60732729 - PipelineSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - PipelineSample - - - 2.0 - - - \ No newline at end of file diff --git a/SpecialCollections/SpecialCollections/PipelineSample/project.json b/SpecialCollections/SpecialCollections/PipelineSample/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/SpecialCollections/SpecialCollections/PipelineSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/SpecialCollections/SpecialCollections/SpecialCollections.sln b/SpecialCollections/SpecialCollections/SpecialCollections.sln index 69f9def9..92f6e176 100644 --- a/SpecialCollections/SpecialCollections/SpecialCollections.sln +++ b/SpecialCollections/SpecialCollections/SpecialCollections.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BitArraySample", "BitArraySample\BitArraySample.xproj", "{50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitArraySample", "BitArraySample\BitArraySample.csproj", "{50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BitVectorSample", "BitVectorSample\BitVectorSample.xproj", "{6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitVectorSample", "BitVectorSample\BitVectorSample.csproj", "{6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ObservableCollectionSample", "ObservableCollectionSample\ObservableCollectionSample.xproj", "{60F92413-92E7-4754-BBF5-1EC8D3302CFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollectionSample", "ObservableCollectionSample\ObservableCollectionSample.csproj", "{60F92413-92E7-4754-BBF5-1EC8D3302CFF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImmutableCollectionSample", "ImmutableCollectionSample\ImmutableCollectionSample.xproj", "{A477D3FE-3EB8-47C8-865A-CC21851A19A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImmutableCollectionSample", "ImmutableCollectionSample\ImmutableCollectionSample.csproj", "{A477D3FE-3EB8-47C8-865A-CC21851A19A5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PipelineSample", "PipelineSample\PipelineSample.xproj", "{D5CBF2FD-05DC-4917-907C-4ECC60732729}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PipelineSample", "PipelineSample\PipelineSample.csproj", "{D5CBF2FD-05DC-4917-907C-4ECC60732729}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,24 +21,24 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Release|Any CPU.Build.0 = Release|Any CPU + {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {50D1349E-2C95-43D8-BDC8-D0094FBCDE1D}.Release|Any CPU.Build.0 = Debug|Any CPU {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Release|Any CPU.Build.0 = Release|Any CPU + {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {6C46ADA8-0E0F-41F4-A9FA-04B380C7B6C5}.Release|Any CPU.Build.0 = Debug|Any CPU {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Release|Any CPU.Build.0 = Release|Any CPU + {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {60F92413-92E7-4754-BBF5-1EC8D3302CFF}.Release|Any CPU.Build.0 = Debug|Any CPU {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Release|Any CPU.Build.0 = Release|Any CPU + {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {A477D3FE-3EB8-47C8-865A-CC21851A19A5}.Release|Any CPU.Build.0 = Debug|Any CPU {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Release|Any CPU.Build.0 = Release|Any CPU + {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {D5CBF2FD-05DC-4917-907C-4ECC60732729}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 797d48b86af8dfe644b28b24dacdc440966df0f8 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Fri, 18 Nov 2016 18:58:35 +0100 Subject: [PATCH 11/90] delegates .NET 1.1 msbuild #27 --- .../AnonymousMethods/AnonymousMethods.csproj | 41 +++++++++++++++ .../AnonymousMethods/AnonymousMethods.xproj | 18 ------- .../AnonymousMethods/project.json | 21 -------- .../BubbleSorter/BubbleSorter.csproj | 41 +++++++++++++++ .../BubbleSorter/BubbleSorter.xproj | 18 ------- .../BubbleSorter/project.json | 21 -------- .../DelegatesAndEventsSamples.sln | 52 +++++++++---------- .../EventsSample/EventsSample.csproj | 41 +++++++++++++++ .../EventsSample/EventsSample.xproj | 18 ------- .../EventsSample/project.json | 21 -------- .../GetAStringDemo/GetAStringDemo.csproj | 41 +++++++++++++++ .../GetAStringDemo/GetAStringDemo.xproj | 18 ------- .../GetAStringDemo/project.json | 21 -------- .../LambdaExpressions.csproj | 41 +++++++++++++++ .../LambdaExpressions/LambdaExpressions.xproj | 18 ------- .../LambdaExpressions/project.json | 21 -------- .../MulticastDelegates.csproj | 41 +++++++++++++++ .../MulticastDelegates.xproj | 18 ------- .../MulticastDelegates/project.json | 21 -------- .../SimpleDelegates/SimpleDelegates.csproj | 41 +++++++++++++++ .../SimpleDelegates/SimpleDelegates.xproj | 18 ------- .../SimpleDelegates/project.json | 21 -------- .../WeakEvents/WeakEvents.csproj | 35 +++++++++++++ .../WeakEvents/WeakEvents.xproj | 18 ------- .../WeakEvents/project.json | 17 ------ 25 files changed, 348 insertions(+), 334 deletions(-) create mode 100644 Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/AnonymousMethods/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/BubbleSorter/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/EventsSample/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/GetAStringDemo/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/LambdaExpressions/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/MulticastDelegates/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/SimpleDelegates/project.json create mode 100644 Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.csproj delete mode 100644 Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.xproj delete mode 100644 Delegates/DelegatesAndEventsSamples/WeakEvents/project.json diff --git a/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.csproj b/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.csproj new file mode 100644 index 00000000..2d88ba97 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + AnonymousMethods + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.xproj b/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.xproj deleted file mode 100644 index 7d6705df..00000000 --- a/Delegates/DelegatesAndEventsSamples/AnonymousMethods/AnonymousMethods.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 01f4111a-87eb-4c79-839d-c0665300286e - AnonymousMethods - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/AnonymousMethods/project.json b/Delegates/DelegatesAndEventsSamples/AnonymousMethods/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/Delegates/DelegatesAndEventsSamples/AnonymousMethods/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.csproj b/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.csproj new file mode 100644 index 00000000..f6c24394 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + BubbleSorter + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.xproj b/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.xproj deleted file mode 100644 index 1b433ca6..00000000 --- a/Delegates/DelegatesAndEventsSamples/BubbleSorter/BubbleSorter.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0f1b742b-cf86-4e8d-b7c1-eec99ab7d2f4 - BubbleSorter - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/BubbleSorter/project.json b/Delegates/DelegatesAndEventsSamples/BubbleSorter/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/BubbleSorter/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/DelegatesAndEventsSamples.sln b/Delegates/DelegatesAndEventsSamples/DelegatesAndEventsSamples.sln index 0299f7cb..e050b046 100644 --- a/Delegates/DelegatesAndEventsSamples/DelegatesAndEventsSamples.sln +++ b/Delegates/DelegatesAndEventsSamples/DelegatesAndEventsSamples.sln @@ -1,23 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24627.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25909.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleDelegates", "SimpleDelegates\SimpleDelegates.xproj", "{FB7D9461-3072-40E8-AC39-3125FCE8F73C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleDelegates", "SimpleDelegates\SimpleDelegates.csproj", "{FB7D9461-3072-40E8-AC39-3125FCE8F73C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BubbleSorter", "BubbleSorter\BubbleSorter.xproj", "{0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BubbleSorter", "BubbleSorter\BubbleSorter.csproj", "{0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LambdaExpressions", "LambdaExpressions\LambdaExpressions.xproj", "{2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LambdaExpressions", "LambdaExpressions\LambdaExpressions.csproj", "{2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EventsSample", "EventsSample\EventsSample.xproj", "{61922EB3-E31E-41DB-B99B-FF1B340080B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventsSample", "EventsSample\EventsSample.csproj", "{61922EB3-E31E-41DB-B99B-FF1B340080B2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WeakEvents", "WeakEvents\WeakEvents.xproj", "{5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeakEvents", "WeakEvents\WeakEvents.csproj", "{5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AnonymousMethods", "AnonymousMethods\AnonymousMethods.xproj", "{01F4111A-87EB-4C79-839D-C0665300286E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousMethods", "AnonymousMethods\AnonymousMethods.csproj", "{01F4111A-87EB-4C79-839D-C0665300286E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GetAStringDemo", "GetAStringDemo\GetAStringDemo.xproj", "{5743215F-666E-4DF4-9B45-4198DC981C6C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetAStringDemo", "GetAStringDemo\GetAStringDemo.csproj", "{5743215F-666E-4DF4-9B45-4198DC981C6C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MulticastDelegates", "MulticastDelegates\MulticastDelegates.xproj", "{21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MulticastDelegates", "MulticastDelegates\MulticastDelegates.csproj", "{21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,36 +27,36 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Release|Any CPU.Build.0 = Release|Any CPU + {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {FB7D9461-3072-40E8-AC39-3125FCE8F73C}.Release|Any CPU.Build.0 = Debug|Any CPU {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Release|Any CPU.Build.0 = Release|Any CPU + {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {0F1B742B-CF86-4E8D-B7C1-EEC99AB7D2F4}.Release|Any CPU.Build.0 = Debug|Any CPU {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Release|Any CPU.Build.0 = Release|Any CPU + {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {2A072C4B-5C3F-4E5F-A29D-BCC28C0E0411}.Release|Any CPU.Build.0 = Debug|Any CPU {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Release|Any CPU.Build.0 = Release|Any CPU + {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {61922EB3-E31E-41DB-B99B-FF1B340080B2}.Release|Any CPU.Build.0 = Debug|Any CPU {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Release|Any CPU.Build.0 = Release|Any CPU + {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5B1EA736-73DE-4049-A21E-DFC60DC4E5FF}.Release|Any CPU.Build.0 = Debug|Any CPU {01F4111A-87EB-4C79-839D-C0665300286E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01F4111A-87EB-4C79-839D-C0665300286E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01F4111A-87EB-4C79-839D-C0665300286E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01F4111A-87EB-4C79-839D-C0665300286E}.Release|Any CPU.Build.0 = Release|Any CPU + {01F4111A-87EB-4C79-839D-C0665300286E}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {01F4111A-87EB-4C79-839D-C0665300286E}.Release|Any CPU.Build.0 = Debug|Any CPU {5743215F-666E-4DF4-9B45-4198DC981C6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5743215F-666E-4DF4-9B45-4198DC981C6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5743215F-666E-4DF4-9B45-4198DC981C6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5743215F-666E-4DF4-9B45-4198DC981C6C}.Release|Any CPU.Build.0 = Release|Any CPU + {5743215F-666E-4DF4-9B45-4198DC981C6C}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5743215F-666E-4DF4-9B45-4198DC981C6C}.Release|Any CPU.Build.0 = Debug|Any CPU {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Release|Any CPU.Build.0 = Release|Any CPU + {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {21337C8B-88CC-4407-AAA6-9EF75C6AFEA6}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.csproj b/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.csproj new file mode 100644 index 00000000..2f4228a8 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + EventsSample + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.xproj b/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.xproj deleted file mode 100644 index e212229e..00000000 --- a/Delegates/DelegatesAndEventsSamples/EventsSample/EventsSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 61922eb3-e31e-41db-b99b-ff1b340080b2 - EventsSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/EventsSample/project.json b/Delegates/DelegatesAndEventsSamples/EventsSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/EventsSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.csproj b/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.csproj new file mode 100644 index 00000000..7672c41c --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + GetAStringDemo + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.xproj b/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.xproj deleted file mode 100644 index bc272340..00000000 --- a/Delegates/DelegatesAndEventsSamples/GetAStringDemo/GetAStringDemo.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5743215f-666e-4df4-9b45-4198dc981c6c - GetAStringDemo - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/GetAStringDemo/project.json b/Delegates/DelegatesAndEventsSamples/GetAStringDemo/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/GetAStringDemo/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.csproj b/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.csproj new file mode 100644 index 00000000..28e12405 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + LambdaExpressions + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.xproj b/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.xproj deleted file mode 100644 index 85d8a4c4..00000000 --- a/Delegates/DelegatesAndEventsSamples/LambdaExpressions/LambdaExpressions.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2a072c4b-5c3f-4e5f-a29d-bcc28c0e0411 - LambdaExpressions - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/LambdaExpressions/project.json b/Delegates/DelegatesAndEventsSamples/LambdaExpressions/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/LambdaExpressions/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.csproj b/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.csproj new file mode 100644 index 00000000..1e9175a6 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + MulticastDelegates + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.xproj b/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.xproj deleted file mode 100644 index e9662cef..00000000 --- a/Delegates/DelegatesAndEventsSamples/MulticastDelegates/MulticastDelegates.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 21337c8b-88cc-4407-aaa6-9ef75c6afea6 - MulticastDelegates - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/MulticastDelegates/project.json b/Delegates/DelegatesAndEventsSamples/MulticastDelegates/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/MulticastDelegates/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.csproj b/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.csproj new file mode 100644 index 00000000..601c0151 --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.csproj @@ -0,0 +1,41 @@ + + + + + netcoreapp1.0 + SimpleDelegates + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + 1.0.1 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.xproj b/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.xproj deleted file mode 100644 index b4f25b5c..00000000 --- a/Delegates/DelegatesAndEventsSamples/SimpleDelegates/SimpleDelegates.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fb7d9461-3072-40e8-ac39-3125fce8f73c - SimpleDelegates - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/SimpleDelegates/project.json b/Delegates/DelegatesAndEventsSamples/SimpleDelegates/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Delegates/DelegatesAndEventsSamples/SimpleDelegates/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.csproj b/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.csproj new file mode 100644 index 00000000..9c9f591c --- /dev/null +++ b/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.csproj @@ -0,0 +1,35 @@ + + + + net46 + WeakEvents + Exe + false + false + false + false + false + false + win7-x64 + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.xproj b/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.xproj deleted file mode 100644 index 3eeb854a..00000000 --- a/Delegates/DelegatesAndEventsSamples/WeakEvents/WeakEvents.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5b1ea736-73de-4049-a21e-dfc60dc4e5ff - WeakEvents - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Delegates/DelegatesAndEventsSamples/WeakEvents/project.json b/Delegates/DelegatesAndEventsSamples/WeakEvents/project.json deleted file mode 100644 index c967ae83..00000000 --- a/Delegates/DelegatesAndEventsSamples/WeakEvents/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "net46": { - "frameworkAssemblies": { - "WindowsBase": "4.0.0.0" - } - } - } -} \ No newline at end of file From 2503006b0ac02ae4d2ac8720fea3e4b01e9545ac Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Sat, 19 Nov 2016 15:28:07 +0100 Subject: [PATCH 12/90] linq .NET Core 1.1, msbuild #27 --- LINQ/LinqSamples/DataLib/DataLib.csproj | 21 ++++++++ LINQ/LinqSamples/DataLib/DataLib.xproj | 18 ------- LINQ/LinqSamples/DataLib/Formula1.cs | 2 +- .../DataLib/Properties/AssemblyInfo.cs | 23 -------- LINQ/LinqSamples/DataLib/project.json | 21 -------- .../EnumerableSample/EnumerableSample.csproj | 27 ++++++++++ .../EnumerableSample/EnumerableSample.xproj | 18 ------- .../Properties/AssemblyInfo.cs | 23 -------- .../LinqSamples/EnumerableSample/project.json | 23 -------- .../ExpressionTreeSample.csproj | 24 +++++++++ .../ExpressionTreeSample.xproj | 18 ------- .../Properties/AssemblyInfo.cs | 23 -------- .../ExpressionTreeSample/project.json | 22 -------- LINQ/LinqSamples/LinqIntro/LinqIntro.csproj | 24 +++++++++ LINQ/LinqSamples/LinqIntro/LinqIntro.xproj | 18 ------- .../LinqIntro/Properties/AssemblyInfo.cs | 23 -------- LINQ/LinqSamples/LinqIntro/project.json | 23 -------- LINQ/LinqSamples/LinqSamples.sln | 54 +++++++++---------- .../ParallelLinqSample.csproj | 24 +++++++++ .../ParallelLinqSample.xproj | 21 -------- .../Properties/AssemblyInfo.cs | 19 ------- .../ParallelLinqSample/project.json | 22 -------- 22 files changed, 148 insertions(+), 343 deletions(-) create mode 100644 LINQ/LinqSamples/DataLib/DataLib.csproj delete mode 100644 LINQ/LinqSamples/DataLib/DataLib.xproj delete mode 100644 LINQ/LinqSamples/DataLib/Properties/AssemblyInfo.cs delete mode 100644 LINQ/LinqSamples/DataLib/project.json create mode 100644 LINQ/LinqSamples/EnumerableSample/EnumerableSample.csproj delete mode 100644 LINQ/LinqSamples/EnumerableSample/EnumerableSample.xproj delete mode 100644 LINQ/LinqSamples/EnumerableSample/Properties/AssemblyInfo.cs delete mode 100644 LINQ/LinqSamples/EnumerableSample/project.json create mode 100644 LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.csproj delete mode 100644 LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.xproj delete mode 100644 LINQ/LinqSamples/ExpressionTreeSample/Properties/AssemblyInfo.cs delete mode 100644 LINQ/LinqSamples/ExpressionTreeSample/project.json create mode 100644 LINQ/LinqSamples/LinqIntro/LinqIntro.csproj delete mode 100644 LINQ/LinqSamples/LinqIntro/LinqIntro.xproj delete mode 100644 LINQ/LinqSamples/LinqIntro/Properties/AssemblyInfo.cs delete mode 100644 LINQ/LinqSamples/LinqIntro/project.json create mode 100644 LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.csproj delete mode 100644 LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.xproj delete mode 100644 LINQ/LinqSamples/ParallelLinqSample/Properties/AssemblyInfo.cs delete mode 100644 LINQ/LinqSamples/ParallelLinqSample/project.json diff --git a/LINQ/LinqSamples/DataLib/DataLib.csproj b/LINQ/LinqSamples/DataLib/DataLib.csproj new file mode 100644 index 00000000..39eab538 --- /dev/null +++ b/LINQ/LinqSamples/DataLib/DataLib.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.4 + DataLib + + + + + + + + 1.6.1 + + + 1.0.0-alpha-20161104-2 + All + + + + \ No newline at end of file diff --git a/LINQ/LinqSamples/DataLib/DataLib.xproj b/LINQ/LinqSamples/DataLib/DataLib.xproj deleted file mode 100644 index b6acd091..00000000 --- a/LINQ/LinqSamples/DataLib/DataLib.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d971c177-c1c3-4f2d-a88a-fba0252f9d6c - DataLib - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/LINQ/LinqSamples/DataLib/Formula1.cs b/LINQ/LinqSamples/DataLib/Formula1.cs index 11a45d04..fd9c04a4 100644 --- a/LINQ/LinqSamples/DataLib/Formula1.cs +++ b/LINQ/LinqSamples/DataLib/Formula1.cs @@ -71,7 +71,7 @@ public static IList GetConstructorChampions() new Team("Renault", 2005, 2006 ), new Team("Brawn GP", 2009), new Team("Red Bull Racing", 2010, 2011, 2012, 2013), - new Team("Mercedes", 2014, 2015) + new Team("Mercedes", 2014, 2015, 2016) }; } return _teams; diff --git a/LINQ/LinqSamples/DataLib/Properties/AssemblyInfo.cs b/LINQ/LinqSamples/DataLib/Properties/AssemblyInfo.cs deleted file mode 100644 index 0c76c83a..00000000 --- a/LINQ/LinqSamples/DataLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("DataLib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DataLib")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("d971c177-c1c3-4f2d-a88a-fba0252f9d6c")] diff --git a/LINQ/LinqSamples/DataLib/project.json b/LINQ/LinqSamples/DataLib/project.json deleted file mode 100644 index eea58f88..00000000 --- a/LINQ/LinqSamples/DataLib/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.6.0" - } - }, - "net46": { - "dependencies": { - - } - } - } -} \ No newline at end of file diff --git a/LINQ/LinqSamples/EnumerableSample/EnumerableSample.csproj b/LINQ/LinqSamples/EnumerableSample/EnumerableSample.csproj new file mode 100644 index 00000000..d92a47f2 --- /dev/null +++ b/LINQ/LinqSamples/EnumerableSample/EnumerableSample.csproj @@ -0,0 +1,27 @@ + + + + Exe + netcoreapp1.0 + + + + + + + + 1.0.1 + + + 1.0.0-alpha-20161104-2 + All + + + 4.3.0 + + + + + + + \ No newline at end of file diff --git a/LINQ/LinqSamples/EnumerableSample/EnumerableSample.xproj b/LINQ/LinqSamples/EnumerableSample/EnumerableSample.xproj deleted file mode 100644 index 647b8f33..00000000 --- a/LINQ/LinqSamples/EnumerableSample/EnumerableSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 938f399c-5058-4140-9616-90144dd5d286 - EnumerableSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/LINQ/LinqSamples/EnumerableSample/Properties/AssemblyInfo.cs b/LINQ/LinqSamples/EnumerableSample/Properties/AssemblyInfo.cs deleted file mode 100644 index 1bc8063d..00000000 --- a/LINQ/LinqSamples/EnumerableSample/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("EnumerableSample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EnumerableSample")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("938f399c-5058-4140-9616-90144dd5d286")] diff --git a/LINQ/LinqSamples/EnumerableSample/project.json b/LINQ/LinqSamples/EnumerableSample/project.json deleted file mode 100644 index ed4c06ca..00000000 --- a/LINQ/LinqSamples/EnumerableSample/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "DataLib": "1.0.0-*", - "System.Collections.NonGeneric": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} \ No newline at end of file diff --git a/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.csproj b/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.csproj new file mode 100644 index 00000000..fcea7a79 --- /dev/null +++ b/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.csproj @@ -0,0 +1,24 @@ + + + + Exe + netcoreapp1.0 + + + + + + + + 1.1.0 + + + 1.0.0-alpha-20161104-2 + All + + + + + + + \ No newline at end of file diff --git a/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.xproj b/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.xproj deleted file mode 100644 index 988ff46e..00000000 --- a/LINQ/LinqSamples/ExpressionTreeSample/ExpressionTreeSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8eb5a2e7-1a97-44b1-a6ba-8d7a5028b75a - ExpressionTreeSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/LINQ/LinqSamples/ExpressionTreeSample/Properties/AssemblyInfo.cs b/LINQ/LinqSamples/ExpressionTreeSample/Properties/AssemblyInfo.cs deleted file mode 100644 index 5af0f7ac..00000000 --- a/LINQ/LinqSamples/ExpressionTreeSample/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("ExpressionTreeSample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ExpressionTreeSample")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("8eb5a2e7-1a97-44b1-a6ba-8d7a5028b75a")] diff --git a/LINQ/LinqSamples/ExpressionTreeSample/project.json b/LINQ/LinqSamples/ExpressionTreeSample/project.json deleted file mode 100644 index 5bdf790b..00000000 --- a/LINQ/LinqSamples/ExpressionTreeSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "DataLib": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} \ No newline at end of file diff --git a/LINQ/LinqSamples/LinqIntro/LinqIntro.csproj b/LINQ/LinqSamples/LinqIntro/LinqIntro.csproj new file mode 100644 index 00000000..fcea7a79 --- /dev/null +++ b/LINQ/LinqSamples/LinqIntro/LinqIntro.csproj @@ -0,0 +1,24 @@ + + + + Exe + netcoreapp1.0 + + + + + + + + 1.1.0 + + + 1.0.0-alpha-20161104-2 + All + + + + + + + \ No newline at end of file diff --git a/LINQ/LinqSamples/LinqIntro/LinqIntro.xproj b/LINQ/LinqSamples/LinqIntro/LinqIntro.xproj deleted file mode 100644 index 82a39563..00000000 --- a/LINQ/LinqSamples/LinqIntro/LinqIntro.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 37358202-dbc9-44af-b94f-e026c077054c - LinqIntro - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/LINQ/LinqSamples/LinqIntro/Properties/AssemblyInfo.cs b/LINQ/LinqSamples/LinqIntro/Properties/AssemblyInfo.cs deleted file mode 100644 index deb754e0..00000000 --- a/LINQ/LinqSamples/LinqIntro/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("LinqIntro")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LinqIntro")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("37358202-dbc9-44af-b94f-e026c077054c")] diff --git a/LINQ/LinqSamples/LinqIntro/project.json b/LINQ/LinqSamples/LinqIntro/project.json deleted file mode 100644 index ed4c06ca..00000000 --- a/LINQ/LinqSamples/LinqIntro/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "DataLib": "1.0.0-*", - "System.Collections.NonGeneric": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} \ No newline at end of file diff --git a/LINQ/LinqSamples/LinqSamples.sln b/LINQ/LinqSamples/LinqSamples.sln index e8788a17..4872e950 100644 --- a/LINQ/LinqSamples/LinqSamples.sln +++ b/LINQ/LinqSamples/LinqSamples.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25914.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DataLib", "DataLib\DataLib.xproj", "{D971C177-C1C3-4F2D-A88A-FBA0252F9D6C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLib", "DataLib\DataLib.csproj", "{8BC3D2D6-A207-480F-8F0E-52942589885C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqIntro", "LinqIntro\LinqIntro.xproj", "{37358202-DBC9-44AF-B94F-E026C077054C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumerableSample", "EnumerableSample\EnumerableSample.csproj", "{42640FCD-62D0-42C6-BFC0-57D3C385D081}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EnumerableSample", "EnumerableSample\EnumerableSample.xproj", "{938F399C-5058-4140-9616-90144DD5D286}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpressionTreeSample", "ExpressionTreeSample\ExpressionTreeSample.csproj", "{01D23F94-74DC-4136-9FF7-6C4D0E1C14F2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExpressionTreeSample", "ExpressionTreeSample\ExpressionTreeSample.xproj", "{8EB5A2E7-1A97-44B1-A6BA-8D7A5028B75A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqIntro", "LinqIntro\LinqIntro.csproj", "{F15824C1-653A-4224-827B-83A2F3A97791}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ParallelLinqSample", "ParallelLinqSample\ParallelLinqSample.xproj", "{1CEFFCD4-7E77-479E-970B-47D76F71794D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParallelLinqSample", "ParallelLinqSample\ParallelLinqSample.csproj", "{07C243F8-86DD-45E7-8958-783AE699DB9B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,26 +19,26 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D971C177-C1C3-4F2D-A88A-FBA0252F9D6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D971C177-C1C3-4F2D-A88A-FBA0252F9D6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D971C177-C1C3-4F2D-A88A-FBA0252F9D6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D971C177-C1C3-4F2D-A88A-FBA0252F9D6C}.Release|Any CPU.Build.0 = Release|Any CPU - {37358202-DBC9-44AF-B94F-E026C077054C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37358202-DBC9-44AF-B94F-E026C077054C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37358202-DBC9-44AF-B94F-E026C077054C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37358202-DBC9-44AF-B94F-E026C077054C}.Release|Any CPU.Build.0 = Release|Any CPU - {938F399C-5058-4140-9616-90144DD5D286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {938F399C-5058-4140-9616-90144DD5D286}.Debug|Any CPU.Build.0 = Debug|Any CPU - {938F399C-5058-4140-9616-90144DD5D286}.Release|Any CPU.ActiveCfg = Release|Any CPU - {938F399C-5058-4140-9616-90144DD5D286}.Release|Any CPU.Build.0 = Release|Any CPU - {8EB5A2E7-1A97-44B1-A6BA-8D7A5028B75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EB5A2E7-1A97-44B1-A6BA-8D7A5028B75A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EB5A2E7-1A97-44B1-A6BA-8D7A5028B75A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EB5A2E7-1A97-44B1-A6BA-8D7A5028B75A}.Release|Any CPU.Build.0 = Release|Any CPU - {1CEFFCD4-7E77-479E-970B-47D76F71794D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CEFFCD4-7E77-479E-970B-47D76F71794D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CEFFCD4-7E77-479E-970B-47D76F71794D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CEFFCD4-7E77-479E-970B-47D76F71794D}.Release|Any CPU.Build.0 = Release|Any CPU + {8BC3D2D6-A207-480F-8F0E-52942589885C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BC3D2D6-A207-480F-8F0E-52942589885C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BC3D2D6-A207-480F-8F0E-52942589885C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BC3D2D6-A207-480F-8F0E-52942589885C}.Release|Any CPU.Build.0 = Release|Any CPU + {42640FCD-62D0-42C6-BFC0-57D3C385D081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42640FCD-62D0-42C6-BFC0-57D3C385D081}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42640FCD-62D0-42C6-BFC0-57D3C385D081}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42640FCD-62D0-42C6-BFC0-57D3C385D081}.Release|Any CPU.Build.0 = Release|Any CPU + {01D23F94-74DC-4136-9FF7-6C4D0E1C14F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01D23F94-74DC-4136-9FF7-6C4D0E1C14F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01D23F94-74DC-4136-9FF7-6C4D0E1C14F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01D23F94-74DC-4136-9FF7-6C4D0E1C14F2}.Release|Any CPU.Build.0 = Release|Any CPU + {F15824C1-653A-4224-827B-83A2F3A97791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F15824C1-653A-4224-827B-83A2F3A97791}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F15824C1-653A-4224-827B-83A2F3A97791}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F15824C1-653A-4224-827B-83A2F3A97791}.Release|Any CPU.Build.0 = Release|Any CPU + {07C243F8-86DD-45E7-8958-783AE699DB9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07C243F8-86DD-45E7-8958-783AE699DB9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07C243F8-86DD-45E7-8958-783AE699DB9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07C243F8-86DD-45E7-8958-783AE699DB9B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.csproj b/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.csproj new file mode 100644 index 00000000..fcea7a79 --- /dev/null +++ b/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.csproj @@ -0,0 +1,24 @@ + + + + Exe + netcoreapp1.0 + + + + + + + + 1.1.0 + + + 1.0.0-alpha-20161104-2 + All + + + + + + + \ No newline at end of file diff --git a/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.xproj b/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.xproj deleted file mode 100644 index 648fff2e..00000000 --- a/LINQ/LinqSamples/ParallelLinqSample/ParallelLinqSample.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 1ceffcd4-7e77-479e-970b-47d76f71794d - ParallelLinqSample - .\obj - .\bin\ - v4.6 - - - - 2.0 - - - diff --git a/LINQ/LinqSamples/ParallelLinqSample/Properties/AssemblyInfo.cs b/LINQ/LinqSamples/ParallelLinqSample/Properties/AssemblyInfo.cs deleted file mode 100644 index f0f9f8b9..00000000 --- a/LINQ/LinqSamples/ParallelLinqSample/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +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: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ParallelLinqSample")] -[assembly: AssemblyTrademark("")] - -// 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("1ceffcd4-7e77-479e-970b-47d76f71794d")] diff --git a/LINQ/LinqSamples/ParallelLinqSample/project.json b/LINQ/LinqSamples/ParallelLinqSample/project.json deleted file mode 100644 index 7bd4bac8..00000000 --- a/LINQ/LinqSamples/ParallelLinqSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "DataLib": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} \ No newline at end of file From c7385127c1a41d7f8ee31e1e128ebe8a9198e7cb Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Sat, 19 Nov 2016 15:54:40 +0100 Subject: [PATCH 13/90] errors and exceptions .net core 1.1 msbuild #27 --- .../CallerInformation.csproj | 35 +++++++++++++++++++ .../CallerInformation/CallerInformation.xproj | 18 ---------- .../CallerInformation/project.json | 21 ----------- .../ErrorsAndExceptions.sln | 34 +++++++++--------- .../ExceptionFilters/ExceptionFilters.csproj | 35 +++++++++++++++++++ .../ExceptionFilters/ExceptionFilters.xproj | 18 ---------- .../ExceptionFilters/project.json | 21 ----------- .../RethrowExceptions.csproj | 35 +++++++++++++++++++ .../RethrowExceptions/RethrowExceptions.xproj | 18 ---------- .../RethrowExceptions/project.json | 21 ----------- .../SimpleExceptions/SimpleExceptions.csproj | 35 +++++++++++++++++++ .../SimpleExceptions/SimpleExceptions.xproj | 18 ---------- .../SimpleExceptions/project.json | 21 ----------- .../SolicitColdCall/SolicitColdCall.csproj | 35 +++++++++++++++++++ .../SolicitColdCall/SolicitColdCall.xproj | 18 ---------- .../SolicitColdCall/project.json | 21 ----------- 16 files changed, 192 insertions(+), 212 deletions(-) create mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.csproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.xproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/project.json create mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.csproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.xproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/project.json create mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.csproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.xproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/project.json create mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.csproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.xproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/project.json create mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.csproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.xproj delete mode 100644 ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/project.json diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.csproj b/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.csproj new file mode 100644 index 00000000..f4d7a47a --- /dev/null +++ b/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + CallerInformation + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.xproj b/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.xproj deleted file mode 100644 index b3e668a4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/CallerInformation.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9fd958eb-6002-402d-a08d-b6205229fe24 - CallerInformation - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/project.json b/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/CallerInformation/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/ErrorsAndExceptions.sln b/ErrorsAndExceptions/ErrorsAndExceptions/ErrorsAndExceptions.sln index c99333c6..b9a1d0db 100644 --- a/ErrorsAndExceptions/ErrorsAndExceptions/ErrorsAndExceptions.sln +++ b/ErrorsAndExceptions/ErrorsAndExceptions/ErrorsAndExceptions.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24713.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25914.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleExceptions", "SimpleExceptions\SimpleExceptions.xproj", "{15EC6219-6E06-492F-B4A8-0720C27C0260}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleExceptions", "SimpleExceptions\SimpleExceptions.csproj", "{15EC6219-6E06-492F-B4A8-0720C27C0260}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionFilters", "ExceptionFilters\ExceptionFilters.xproj", "{CF833C84-F855-4ABF-8861-02F0BC1376FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExceptionFilters", "ExceptionFilters\ExceptionFilters.csproj", "{CF833C84-F855-4ABF-8861-02F0BC1376FC}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RethrowExceptions", "RethrowExceptions\RethrowExceptions.xproj", "{D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RethrowExceptions", "RethrowExceptions\RethrowExceptions.csproj", "{D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SolicitColdCall", "SolicitColdCall\SolicitColdCall.xproj", "{137F3586-57E2-40B9-89CD-8FA2A9848AA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolicitColdCall", "SolicitColdCall\SolicitColdCall.csproj", "{137F3586-57E2-40B9-89CD-8FA2A9848AA2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CallerInformation", "CallerInformation\CallerInformation.xproj", "{9FD958EB-6002-402D-A08D-B6205229FE24}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CallerInformation", "CallerInformation\CallerInformation.csproj", "{9FD958EB-6002-402D-A08D-B6205229FE24}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,24 +21,24 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {15EC6219-6E06-492F-B4A8-0720C27C0260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15EC6219-6E06-492F-B4A8-0720C27C0260}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15EC6219-6E06-492F-B4A8-0720C27C0260}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15EC6219-6E06-492F-B4A8-0720C27C0260}.Release|Any CPU.Build.0 = Release|Any CPU + {15EC6219-6E06-492F-B4A8-0720C27C0260}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {15EC6219-6E06-492F-B4A8-0720C27C0260}.Release|Any CPU.Build.0 = Debug|Any CPU {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Release|Any CPU.Build.0 = Release|Any CPU + {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {CF833C84-F855-4ABF-8861-02F0BC1376FC}.Release|Any CPU.Build.0 = Debug|Any CPU {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Release|Any CPU.Build.0 = Release|Any CPU + {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {D81D6EA0-A23C-4C0A-A926-C3B190B6F74C}.Release|Any CPU.Build.0 = Debug|Any CPU {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Release|Any CPU.Build.0 = Release|Any CPU + {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {137F3586-57E2-40B9-89CD-8FA2A9848AA2}.Release|Any CPU.Build.0 = Debug|Any CPU {9FD958EB-6002-402D-A08D-B6205229FE24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9FD958EB-6002-402D-A08D-B6205229FE24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD958EB-6002-402D-A08D-B6205229FE24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD958EB-6002-402D-A08D-B6205229FE24}.Release|Any CPU.Build.0 = Release|Any CPU + {9FD958EB-6002-402D-A08D-B6205229FE24}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {9FD958EB-6002-402D-A08D-B6205229FE24}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.csproj b/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.csproj new file mode 100644 index 00000000..e0ba3fde --- /dev/null +++ b/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + ExceptionFilters + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.xproj b/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.xproj deleted file mode 100644 index b471df0e..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/ExceptionFilters.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cf833c84-f855-4abf-8861-02f0bc1376fc - ExceptionFilters - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/project.json b/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/ExceptionFilters/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.csproj b/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.csproj new file mode 100644 index 00000000..74c73639 --- /dev/null +++ b/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + RethrowExceptions + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.xproj b/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.xproj deleted file mode 100644 index 220cc96e..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/RethrowExceptions.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d81d6ea0-a23c-4c0a-a926-c3b190b6f74c - RethrowExceptions - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/project.json b/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/RethrowExceptions/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.csproj b/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.csproj new file mode 100644 index 00000000..49ee51c6 --- /dev/null +++ b/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + SimpleExceptions + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.xproj b/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.xproj deleted file mode 100644 index c6e4b8e3..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/SimpleExceptions.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 15ec6219-6e06-492f-b4a8-0720c27c0260 - SimpleExceptions - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/project.json b/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/SimpleExceptions/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.csproj b/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.csproj new file mode 100644 index 00000000..0692763f --- /dev/null +++ b/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp1.0 + SolicitColdCall + Exe + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + 1.1.0 + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.xproj b/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.xproj deleted file mode 100644 index d4c9f746..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/SolicitColdCall.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 137f3586-57e2-40b9-89cd-8fa2a9848aa2 - SolicitColdCall - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/project.json b/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/ErrorsAndExceptions/ErrorsAndExceptions/SolicitColdCall/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 2e878cc049158c2d8452bfcdb16635beebdf34ee Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Sat, 19 Nov 2016 16:47:30 +0100 Subject: [PATCH 14/90] async samples .net core 1.1 msbuild #27 --- Async/AsyncSamples/AsyncLib/AsyncLib.csproj | 4 ++- .../AsyncLib/Properties/AssemblyInfo.cs | 30 ---------------- Async/AsyncSamples/AsyncLib/project.json | 2 +- .../AsyncPatternsWPF/packages.config | 4 +-- Async/AsyncSamples/AsyncSamples.sln | 23 ++++++------ .../ErrorHandling/ErrorHandling.csproj | 29 +++++++++++++++ .../ErrorHandling/ErrorHandling.xproj | 18 ---------- Async/AsyncSamples/ErrorHandling/project.json | 21 ----------- .../Foundations/Foundations.csproj | 35 +++++++++++++++++++ .../Foundations/Foundations.xproj | 18 ---------- Async/AsyncSamples/Foundations/project.json | 26 -------------- 11 files changed, 80 insertions(+), 130 deletions(-) delete mode 100644 Async/AsyncSamples/AsyncLib/Properties/AssemblyInfo.cs create mode 100644 Async/AsyncSamples/ErrorHandling/ErrorHandling.csproj delete mode 100644 Async/AsyncSamples/ErrorHandling/ErrorHandling.xproj delete mode 100644 Async/AsyncSamples/ErrorHandling/project.json create mode 100644 Async/AsyncSamples/Foundations/Foundations.csproj delete mode 100644 Async/AsyncSamples/Foundations/Foundations.xproj delete mode 100644 Async/AsyncSamples/Foundations/project.json diff --git a/Async/AsyncSamples/AsyncLib/AsyncLib.csproj b/Async/AsyncSamples/AsyncLib/AsyncLib.csproj index e370cb33..ee2515f1 100644 --- a/Async/AsyncSamples/AsyncLib/AsyncLib.csproj +++ b/Async/AsyncSamples/AsyncLib/AsyncLib.csproj @@ -43,10 +43,12 @@ - + + + - @@ -107,6 +107,9 @@ Designer + + + @@ -128,9 +131,11 @@ Designer + 14.0 + - \ No newline at end of file + diff --git a/Synchronization/SynchronizationSamples/global.json b/Synchronization/SynchronizationSamples/global.json deleted file mode 100644 index fdd7c1b5..00000000 --- a/Synchronization/SynchronizationSamples/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} \ No newline at end of file From d2a40e658355af62cd79fd7a02f4f04485b006ed Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Fri, 10 Mar 2017 15:50:56 +0100 Subject: [PATCH 37/90] #27 --- .../AnonymousPipes/AnonymousPipes.csproj | 14 +++++ .../AnonymousPipes/AnonymousPipes.xproj | 18 ------ .../AnonymousPipes/project.json | 22 ------- .../CompressFileSample.csproj | 16 +++++ .../CompressFileSample/CompressFileSample.sln | 8 +-- .../CompressFileSample.xproj | 18 ------ .../CompressFileSample/project.json | 23 ------- .../DriveInformation/DriveInformation.csproj | 13 ++++ .../DriveInformation/DriveInformation.sln | 8 +-- .../DriveInformation/DriveInformation.xproj | 18 ------ .../DriveInformation/project.json | 22 ------- .../FileMonitor/FileMonitor.csproj | 14 +++++ .../FileMonitor/FileMonitor.sln | 8 +-- .../FileMonitor/FileMonitor.xproj | 18 ------ .../FileMonitor/project.json | 22 ------- .../FilesAndStreamsSamples.sln | 60 +++++++++---------- .../MemoryMappedFilesSample.csproj | 14 +++++ .../MemoryMappedFilesSample.xproj | 18 ------ .../MemoryMappedFilesSample/project.json | 22 ------- .../PipesReader/PipesReader.csproj | 14 +++++ .../PipesReader/PipesReader.xproj | 18 ------ .../PipesReader/project.json | 22 ------- .../PipesWriter/PipesWriter.csproj | 14 +++++ .../PipesWriter/PipesWriter.xproj | 18 ------ .../PipesWriter/project.json | 22 ------- .../ReaderWriterSamples.csproj | 14 +++++ .../ReaderWriterSamples.xproj | 18 ------ .../ReaderWriterSamples/project.json | 22 ------- .../StreamSamples/Program.cs | 4 +- .../StreamSamples/StreamSamples.csproj | 14 +++++ .../StreamSamples/StreamSamples.xproj | 21 ------- .../StreamSamples/project.json | 22 ------- .../WindowsAppEditor/MainPage.xaml | 3 +- .../WindowsAppEditor/WindowsAppEditor.csproj | 2 +- .../WindowsAppEditor.nuget.props | 21 +++++++ .../WindowsAppEditor.nuget.targets | 12 ++++ .../WindowsAppEditor/project.json | 2 +- .../WorkingWithFilesAndFolders.csproj | 10 ++++ .../WorkingWithFilesAndFolders.sln | 8 +-- .../WorkingWithFilesAndFolders.xproj | 18 ------ .../WorkingWithFilesAndFolders/project.json | 21 ------- 41 files changed, 220 insertions(+), 456 deletions(-) create mode 100644 FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/DriveInformation/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/FileMonitor/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesReader/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/PipesWriter/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/StreamSamples/project.json create mode 100644 FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.props create mode 100644 FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.targets create mode 100644 FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.csproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.xproj delete mode 100644 FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/project.json diff --git a/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.csproj b/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.csproj new file mode 100644 index 00000000..4cf45a3a --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + AnonymousPipes + Exe + AnonymousPipes + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.xproj b/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.xproj deleted file mode 100644 index 9876c88a..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/AnonymousPipes.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1c4af3c3-b50e-4929-8ab4-7862fde181ad - AnonymousPipes - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/project.json b/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/project.json deleted file mode 100644 index c1f10f8c..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/AnonymousPipes/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.IO.Pipes": "4.0.0" - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.csproj b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.csproj new file mode 100644 index 00000000..5ede0965 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp1.1 + CompressFileSample + Exe + CompressFileSample + $(PackageTargetFallback);dnxcore50 + + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.sln b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.sln index b50fc362..6e012745 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.sln +++ b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompressFileSample", "CompressFileSample.xproj", "{34216666-13CA-4913-A988-7860A50666BD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompressFileSample", "CompressFileSample.csproj", "{34216666-13CA-4913-A988-7860A50666BD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.xproj b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.xproj deleted file mode 100644 index c914b313..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/CompressFileSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 34216666-13ca-4913-a988-7860a50666bd - CompressFileSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/project.json b/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/project.json deleted file mode 100644 index 1309c6c9..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/CompressFileSample/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.Compression": "4.1.0", - "System.IO.Compression.ZipFile": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.csproj b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.csproj new file mode 100644 index 00000000..b62a39ad --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp1.1 + DriveInformation + Exe + DriveInformation + + + + + + \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.sln b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.sln index 8da452c8..641c42cb 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.sln +++ b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DriveInformation", "DriveInformation.xproj", "{3E7F44A0-2826-47AE-ACB9-0FE4469D9539}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriveInformation", "DriveInformation.csproj", "{3E7F44A0-2826-47AE-ACB9-0FE4469D9539}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.xproj b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.xproj deleted file mode 100644 index 714336b8..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/DriveInformation.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3e7f44a0-2826-47ae-acb9-0fe4469d9539 - DriveInformation - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/project.json b/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/project.json deleted file mode 100644 index fdb5fa35..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/DriveInformation/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.FileSystem.DriveInfo": "4.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.csproj b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.csproj new file mode 100644 index 00000000..95f697d8 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + FileMonitor + Exe + FileMonitor + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.sln b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.sln index 33d0ebad..fcc9ec24 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.sln +++ b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FileMonitor", "FileMonitor.xproj", "{6C498506-4137-4D56-BAF4-9AB6D226B26F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileMonitor", "FileMonitor.csproj", "{6C498506-4137-4D56-BAF4-9AB6D226B26F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.xproj b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.xproj deleted file mode 100644 index 8dea9f9f..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/FileMonitor.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6c498506-4137-4d56-baf4-9ab6d226b26f - FileMonitor - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/project.json b/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/project.json deleted file mode 100644 index 96c017ea..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/FileMonitor/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.FileSystem.Watcher": "4.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/FilesAndStreamsSamples.sln b/FilesAndStreams/FilesAndStreamsSamples/FilesAndStreamsSamples.sln index af7a3864..bae1a48c 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/FilesAndStreamsSamples.sln +++ b/FilesAndStreams/FilesAndStreamsSamples/FilesAndStreamsSamples.sln @@ -1,32 +1,32 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DriveInformation", "DriveInformation\DriveInformation.xproj", "{3E7F44A0-2826-47AE-ACB9-0FE4469D9539}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DriveInformation", "DriveInformation\DriveInformation.csproj", "{3E7F44A0-2826-47AE-ACB9-0FE4469D9539}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WorkingWithFilesAndFolders", "WorkingWithFilesAndFolders\WorkingWithFilesAndFolders.xproj", "{2FFFBF24-B525-42F3-BC6E-E1627D111424}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkingWithFilesAndFolders", "WorkingWithFilesAndFolders\WorkingWithFilesAndFolders.csproj", "{2FFFBF24-B525-42F3-BC6E-E1627D111424}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFEditor", "WPFEditor\WPFEditor.csproj", "{B2B172E6-E250-4B58-B8B5-B60617792261}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StreamSamples", "StreamSamples\StreamSamples.xproj", "{27C174CC-9904-41F3-A539-C2BD548CE71B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamSamples", "StreamSamples\StreamSamples.csproj", "{27C174CC-9904-41F3-A539-C2BD548CE71B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReaderWriterSamples", "ReaderWriterSamples\ReaderWriterSamples.xproj", "{581E5A0D-CA64-4D61-98FE-7808C1AE62CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReaderWriterSamples", "ReaderWriterSamples\ReaderWriterSamples.csproj", "{581E5A0D-CA64-4D61-98FE-7808C1AE62CC}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompressFileSample", "CompressFileSample\CompressFileSample.xproj", "{34216666-13CA-4913-A988-7860A50666BD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompressFileSample", "CompressFileSample\CompressFileSample.csproj", "{34216666-13CA-4913-A988-7860A50666BD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FileMonitor", "FileMonitor\FileMonitor.xproj", "{6C498506-4137-4D56-BAF4-9AB6D226B26F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileMonitor", "FileMonitor\FileMonitor.csproj", "{6C498506-4137-4D56-BAF4-9AB6D226B26F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MemoryMappedFilesSample", "MemoryMappedFilesSample\MemoryMappedFilesSample.xproj", "{685C9095-690A-48BA-B499-AE6922051D5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MemoryMappedFilesSample", "MemoryMappedFilesSample\MemoryMappedFilesSample.csproj", "{685C9095-690A-48BA-B499-AE6922051D5B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PipesReader", "PipesReader\PipesReader.xproj", "{37B9F3EB-B205-47EF-B704-3311669A866A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PipesReader", "PipesReader\PipesReader.csproj", "{37B9F3EB-B205-47EF-B704-3311669A866A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PipesWriter", "PipesWriter\PipesWriter.xproj", "{E200CDF7-84F6-4A78-A832-12695D391E3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PipesWriter", "PipesWriter\PipesWriter.csproj", "{E200CDF7-84F6-4A78-A832-12695D391E3E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AnonymousPipes", "AnonymousPipes\AnonymousPipes.xproj", "{1C4AF3C3-B50E-4929-8AB4-7862FDE181AD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousPipes", "AnonymousPipes\AnonymousPipes.csproj", "{1C4AF3C3-B50E-4929-8AB4-7862FDE181AD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsAppEditor", "WindowsAppEditor\WindowsAppEditor.csproj", "{DEDF55AC-95A1-47CE-B4DF-7891E5BCBA76}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFEditor", "WPFEditor\WPFEditor.csproj", "{B2B172E6-E250-4B58-B8B5-B60617792261}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -71,22 +71,6 @@ Global {2FFFBF24-B525-42F3-BC6E-E1627D111424}.Release|x64.Build.0 = Release|Any CPU {2FFFBF24-B525-42F3-BC6E-E1627D111424}.Release|x86.ActiveCfg = Release|Any CPU {2FFFBF24-B525-42F3-BC6E-E1627D111424}.Release|x86.Build.0 = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|ARM.Build.0 = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x64.ActiveCfg = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x64.Build.0 = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x86.Build.0 = Debug|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|Any CPU.Build.0 = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|ARM.ActiveCfg = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|ARM.Build.0 = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x64.ActiveCfg = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x64.Build.0 = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x86.ActiveCfg = Release|Any CPU - {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x86.Build.0 = Release|Any CPU {27C174CC-9904-41F3-A539-C2BD548CE71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27C174CC-9904-41F3-A539-C2BD548CE71B}.Debug|Any CPU.Build.0 = Debug|Any CPU {27C174CC-9904-41F3-A539-C2BD548CE71B}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -237,6 +221,22 @@ Global {DEDF55AC-95A1-47CE-B4DF-7891E5BCBA76}.Release|x86.ActiveCfg = Release|x86 {DEDF55AC-95A1-47CE-B4DF-7891E5BCBA76}.Release|x86.Build.0 = Release|x86 {DEDF55AC-95A1-47CE-B4DF-7891E5BCBA76}.Release|x86.Deploy.0 = Release|x86 + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|ARM.ActiveCfg = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|ARM.Build.0 = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x64.ActiveCfg = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x64.Build.0 = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x86.ActiveCfg = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Debug|x86.Build.0 = Debug|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|Any CPU.Build.0 = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|ARM.ActiveCfg = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|ARM.Build.0 = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x64.ActiveCfg = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x64.Build.0 = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x86.ActiveCfg = Release|Any CPU + {B2B172E6-E250-4B58-B8B5-B60617792261}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.csproj b/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.csproj new file mode 100644 index 00000000..6ea2123e --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + MemoryMappedFilesSample + Exe + MemoryMappedFilesSample + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.xproj b/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.xproj deleted file mode 100644 index 38a89a36..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/MemoryMappedFilesSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 685c9095-690a-48ba-b499-ae6922051d5b - MemoryMappedFilesSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/project.json b/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/project.json deleted file mode 100644 index 1cce8db2..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/MemoryMappedFilesSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.MemoryMappedFiles": "4.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.csproj b/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.csproj new file mode 100644 index 00000000..a023a383 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + PipesReader + Exe + PipesReader + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.xproj b/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.xproj deleted file mode 100644 index c4e8f783..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/PipesReader/PipesReader.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 37b9f3eb-b205-47ef-b704-3311669a866a - PipesReader - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesReader/project.json b/FilesAndStreams/FilesAndStreamsSamples/PipesReader/project.json deleted file mode 100644 index 61713b93..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/PipesReader/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.Pipes": "4.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.csproj b/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.csproj new file mode 100644 index 00000000..d1d22c11 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + PipesWriter + Exe + PipesWriter + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.xproj b/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.xproj deleted file mode 100644 index 93d53610..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/PipesWriter.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e200cdf7-84f6-4a78-a832-12695d391e3e - PipesWriter - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/project.json b/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/project.json deleted file mode 100644 index 61713b93..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/PipesWriter/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.Pipes": "4.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.csproj b/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.csproj new file mode 100644 index 00000000..36159ad2 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + ReaderWriterSamples + Exe + ReaderWriterSamples + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.xproj b/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.xproj deleted file mode 100644 index 94528e33..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/ReaderWriterSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 581e5a0d-ca64-4d61-98fe-7808c1ae62cc - ReaderWriterSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/project.json b/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/project.json deleted file mode 100644 index c904686c..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/ReaderWriterSamples/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.FileSystem": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/Program.cs b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/Program.cs index dabfa871..3973050b 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/Program.cs +++ b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/Program.cs @@ -94,8 +94,7 @@ public static void RandomAccessSample() string line = ReadLine(); if (line.ToUpper().CompareTo("BYE") == 0) break; - int record; - if (int.TryParse(line, out record)) + if (int.TryParse(line, out int record)) { stream.Seek((record - 1) * RECORDSIZE, SeekOrigin.Begin); stream.Read(buffer, 0, RECORDSIZE); @@ -147,7 +146,6 @@ public static async Task CreateSampleFileAsync(int nRecords) } } - public static void CopyUsingStreams(string inputFile, string outputFile) { const int BUFFERSIZE = 4096; diff --git a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.csproj b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.csproj new file mode 100644 index 00000000..3d13ee70 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp1.1 + StreamSamples + Exe + StreamSamples + + + + + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.xproj b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.xproj deleted file mode 100644 index 7a2e9110..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/StreamSamples.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 27c174cc-9904-41f3-a539-c2bd548ce71b - StreamSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - StreamSamples - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/project.json b/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/project.json deleted file mode 100644 index c904686c..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/StreamSamples/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.IO.FileSystem": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/MainPage.xaml b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/MainPage.xaml index 5b71e5c5..1f6d5b82 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/MainPage.xaml +++ b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/MainPage.xaml @@ -17,7 +17,6 @@ - - + diff --git a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.csproj b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.csproj index 3b0c03b0..d3c8a3ac 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.csproj +++ b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.10586.0 - 10.0.10240.0 + 10.0.10586.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.props b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.props new file mode 100644 index 00000000..805b163e --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.props @@ -0,0 +1,21 @@ + + + + True + NuGet + C:\githubvs2017\ProfessionalCSharp6\FilesAndStreams\FilesAndStreamsSamples\WindowsAppEditor\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\chris\.nuget\packages\ + ProjectJson + 4.0.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.targets b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.targets new file mode 100644 index 00000000..b0400075 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/WindowsAppEditor.nuget.targets @@ -0,0 +1,12 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/project.json b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/project.json index 32d92747..91b3dfc8 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/project.json +++ b/FilesAndStreams/FilesAndStreamsSamples/WindowsAppEditor/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" + "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1" }, "frameworks": { "uap10.0": {} diff --git a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.csproj b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.csproj new file mode 100644 index 00000000..b5d67b29 --- /dev/null +++ b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + WorkingWithFilesAndFolders + Exe + WorkingWithFilesAndFolders + + + diff --git a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.sln b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.sln index 03878113..36207e2c 100644 --- a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.sln +++ b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WorkingWithFilesAndFolders", "WorkingWithFilesAndFolders.xproj", "{2FFFBF24-B525-42F3-BC6E-E1627D111424}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkingWithFilesAndFolders", "WorkingWithFilesAndFolders.csproj", "{2FFFBF24-B525-42F3-BC6E-E1627D111424}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.xproj b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.xproj deleted file mode 100644 index 66b7d253..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/WorkingWithFilesAndFolders.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2fffbf24-b525-42f3-bc6e-e1627d111424 - WorkingWithFilesAndFolders - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/project.json b/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/FilesAndStreams/FilesAndStreamsSamples/WorkingWithFilesAndFolders/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 0eeb2bd5316d0a5d424167c912729e011f2548ff Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Fri, 10 Mar 2017 17:01:55 +0100 Subject: [PATCH 38/90] networking samples #27 #29 --- .../ConsoleApp1/ConsoleApp1.csproj | 8 ++++ .../NetworkingSamples/ConsoleApp1/Program.cs | 12 ++++++ .../DnsLookup/DnsLookup.csproj | 10 +++++ .../DnsLookup/DnsLookup.xproj | 18 -------- .../NetworkingSamples/DnsLookup/project.json | 21 ---------- .../HttpClientSample/HttpClientSample.csproj | 8 ++++ .../HttpClientSample/HttpClientSample.xproj | 18 -------- .../HttpClientSample/Program.cs | 8 +--- .../Properties/launchSettings.json | 2 +- .../HttpClientSample/project.json | 21 ---------- .../HttpClientUsingTcp.csproj | 10 +++++ .../HttpClientUsingTcp.xproj | 18 -------- .../Properties/launchSettings.json | 2 +- .../HttpClientUsingTcp/project.json | 21 ---------- .../HttpServer/HttpServer.csproj | 12 ++++++ .../HttpServer/HttpServer.xproj | 18 -------- .../NetworkingSamples/HttpServer/Program.cs | 7 ++-- .../HttpServer/Properties/launchSettings.json | 2 +- .../NetworkingSamples/HttpServer/project.json | 22 ---------- .../NetworkingSamples/NetworkingSamples.sln | 41 +++++++++---------- .../Properties/launchSettings.json | 2 +- .../SocketClient/SocketClient.csproj | 10 +++++ .../SocketClient/SocketClient.xproj | 18 -------- .../SocketClient/project.json | 21 ---------- .../NetworkingSamples/SocketServer/Program.cs | 6 +-- .../Properties/launchSettings.json | 2 +- .../SocketServer/SocketServer.csproj | 10 +++++ .../SocketServer/SocketServer.xproj | 18 -------- .../SocketServer/project.json | 21 ---------- .../TcpClientSample/Program.cs | 4 +- .../TcpClientSample/TcpClientSample.csproj | 10 +++++ .../TcpClientSample/TcpClientSample.xproj | 18 -------- .../TcpClientSample/project.json | 21 ---------- .../TcpServer/TcpServer.csproj | 10 +++++ .../TcpServer/TcpServer.xproj | 18 -------- .../NetworkingSamples/TcpServer/project.json | 21 ---------- .../Properties/launchSettings.json | 2 +- .../UdpReceiver/UdpReceiver.csproj | 10 +++++ .../UdpReceiver/UdpReceiver.xproj | 18 -------- .../UdpReceiver/project.json | 22 ---------- .../UdpSender/UdpSender.csproj | 10 +++++ .../UdpSender/UdpSender.xproj | 18 -------- .../NetworkingSamples/UdpSender/project.json | 21 ---------- .../NetworkingSamples/Utilities/Program.cs | 5 +-- .../Utilities/Properties/launchSettings.json | 2 +- .../Utilities/Utilities.csproj | 10 +++++ .../Utilities/Utilities.xproj | 18 -------- .../NetworkingSamples/Utilities/project.json | 21 ---------- .../WinAppHttpClient.nuget.props | 21 ++++++++++ .../WinAppHttpClient.nuget.targets | 12 ++++++ .../WinAppHttpClient/project.json | 2 +- Networking/NetworkingSamples/global.json | 8 ---- 52 files changed, 198 insertions(+), 491 deletions(-) create mode 100644 Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj create mode 100644 Networking/NetworkingSamples/ConsoleApp1/Program.cs create mode 100644 Networking/NetworkingSamples/DnsLookup/DnsLookup.csproj delete mode 100644 Networking/NetworkingSamples/DnsLookup/DnsLookup.xproj delete mode 100644 Networking/NetworkingSamples/DnsLookup/project.json create mode 100644 Networking/NetworkingSamples/HttpClientSample/HttpClientSample.csproj delete mode 100644 Networking/NetworkingSamples/HttpClientSample/HttpClientSample.xproj delete mode 100644 Networking/NetworkingSamples/HttpClientSample/project.json create mode 100644 Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.csproj delete mode 100644 Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.xproj delete mode 100644 Networking/NetworkingSamples/HttpClientUsingTcp/project.json create mode 100644 Networking/NetworkingSamples/HttpServer/HttpServer.csproj delete mode 100644 Networking/NetworkingSamples/HttpServer/HttpServer.xproj delete mode 100644 Networking/NetworkingSamples/HttpServer/project.json create mode 100644 Networking/NetworkingSamples/SocketClient/SocketClient.csproj delete mode 100644 Networking/NetworkingSamples/SocketClient/SocketClient.xproj delete mode 100644 Networking/NetworkingSamples/SocketClient/project.json create mode 100644 Networking/NetworkingSamples/SocketServer/SocketServer.csproj delete mode 100644 Networking/NetworkingSamples/SocketServer/SocketServer.xproj delete mode 100644 Networking/NetworkingSamples/SocketServer/project.json create mode 100644 Networking/NetworkingSamples/TcpClientSample/TcpClientSample.csproj delete mode 100644 Networking/NetworkingSamples/TcpClientSample/TcpClientSample.xproj delete mode 100644 Networking/NetworkingSamples/TcpClientSample/project.json create mode 100644 Networking/NetworkingSamples/TcpServer/TcpServer.csproj delete mode 100644 Networking/NetworkingSamples/TcpServer/TcpServer.xproj delete mode 100644 Networking/NetworkingSamples/TcpServer/project.json create mode 100644 Networking/NetworkingSamples/UdpReceiver/UdpReceiver.csproj delete mode 100644 Networking/NetworkingSamples/UdpReceiver/UdpReceiver.xproj delete mode 100644 Networking/NetworkingSamples/UdpReceiver/project.json create mode 100644 Networking/NetworkingSamples/UdpSender/UdpSender.csproj delete mode 100644 Networking/NetworkingSamples/UdpSender/UdpSender.xproj delete mode 100644 Networking/NetworkingSamples/UdpSender/project.json create mode 100644 Networking/NetworkingSamples/Utilities/Utilities.csproj delete mode 100644 Networking/NetworkingSamples/Utilities/Utilities.xproj delete mode 100644 Networking/NetworkingSamples/Utilities/project.json create mode 100644 Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.props create mode 100644 Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.targets delete mode 100644 Networking/NetworkingSamples/global.json diff --git a/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj b/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj new file mode 100644 index 00000000..6d25f413 --- /dev/null +++ b/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp1.1 + + + \ No newline at end of file diff --git a/Networking/NetworkingSamples/ConsoleApp1/Program.cs b/Networking/NetworkingSamples/ConsoleApp1/Program.cs new file mode 100644 index 00000000..be1b5acd --- /dev/null +++ b/Networking/NetworkingSamples/ConsoleApp1/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace ConsoleApp1 +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} \ No newline at end of file diff --git a/Networking/NetworkingSamples/DnsLookup/DnsLookup.csproj b/Networking/NetworkingSamples/DnsLookup/DnsLookup.csproj new file mode 100644 index 00000000..6c7e9a7e --- /dev/null +++ b/Networking/NetworkingSamples/DnsLookup/DnsLookup.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + DnsLookup + Exe + DnsLookup + + + diff --git a/Networking/NetworkingSamples/DnsLookup/DnsLookup.xproj b/Networking/NetworkingSamples/DnsLookup/DnsLookup.xproj deleted file mode 100644 index 6c20f146..00000000 --- a/Networking/NetworkingSamples/DnsLookup/DnsLookup.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 03d1b0c3-59a2-4a8f-bdca-1c2a62c964eb - DnsLookup - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/DnsLookup/project.json b/Networking/NetworkingSamples/DnsLookup/project.json deleted file mode 100644 index fe1772f4..00000000 --- a/Networking/NetworkingSamples/DnsLookup/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.csproj b/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.csproj new file mode 100644 index 00000000..56099a65 --- /dev/null +++ b/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.csproj @@ -0,0 +1,8 @@ + + + + netcoreapp1.1 + Exe + + + diff --git a/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.xproj b/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.xproj deleted file mode 100644 index 6266faba..00000000 --- a/Networking/NetworkingSamples/HttpClientSample/HttpClientSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bfb1969a-4996-40d3-9c62-2c246551325a - HttpClientSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/HttpClientSample/Program.cs b/Networking/NetworkingSamples/HttpClientSample/Program.cs index d2a2b4ab..8bcf0592 100644 --- a/Networking/NetworkingSamples/HttpClientSample/Program.cs +++ b/Networking/NetworkingSamples/HttpClientSample/Program.cs @@ -144,8 +144,6 @@ public static async Task GetDataWithHeadersAsync() } } - - public static void ShowHeaders(string title, HttpHeaders headers) { WriteLine(title); @@ -184,7 +182,5 @@ public static async Task GetDataWithMessageHandlerAsync() WriteLine($"{ex.Message}"); } } - } - - -} + } +} \ No newline at end of file diff --git a/Networking/NetworkingSamples/HttpClientSample/Properties/launchSettings.json b/Networking/NetworkingSamples/HttpClientSample/Properties/launchSettings.json index b69be508..a75a851d 100644 --- a/Networking/NetworkingSamples/HttpClientSample/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/HttpClientSample/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "HttpClientSample": { - "commandName": "HttpClientSample", + "commandName": "Project", "commandLineArgs": "-mh" } } diff --git a/Networking/NetworkingSamples/HttpClientSample/project.json b/Networking/NetworkingSamples/HttpClientSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/HttpClientSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.csproj b/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.csproj new file mode 100644 index 00000000..af120c9c --- /dev/null +++ b/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + HttpClientUsingTcp + Exe + HttpClientUsingTcp + + + diff --git a/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.xproj b/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.xproj deleted file mode 100644 index a91123ef..00000000 --- a/Networking/NetworkingSamples/HttpClientUsingTcp/HttpClientUsingTcp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0891bd03-3159-4791-be8e-8e619b58afb9 - HttpClientUsingTcp - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/HttpClientUsingTcp/Properties/launchSettings.json b/Networking/NetworkingSamples/HttpClientUsingTcp/Properties/launchSettings.json index 5a2f2a03..8ac95876 100644 --- a/Networking/NetworkingSamples/HttpClientUsingTcp/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/HttpClientUsingTcp/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "HttpClientUsingTcp": { - "commandName": "HttpClientUsingTcp", + "commandName": "Project", "commandLineArgs": "www.cninnovation.com" } } diff --git a/Networking/NetworkingSamples/HttpClientUsingTcp/project.json b/Networking/NetworkingSamples/HttpClientUsingTcp/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/HttpClientUsingTcp/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/HttpServer/HttpServer.csproj b/Networking/NetworkingSamples/HttpServer/HttpServer.csproj new file mode 100644 index 00000000..4b1594ed --- /dev/null +++ b/Networking/NetworkingSamples/HttpServer/HttpServer.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/Networking/NetworkingSamples/HttpServer/HttpServer.xproj b/Networking/NetworkingSamples/HttpServer/HttpServer.xproj deleted file mode 100644 index ccc86e43..00000000 --- a/Networking/NetworkingSamples/HttpServer/HttpServer.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 033af70e-2660-4e6a-8743-1184102f8d98 - HttpServer - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/HttpServer/Program.cs b/Networking/NetworkingSamples/HttpServer/Program.cs index 4b85232b..97b15503 100644 --- a/Networking/NetworkingSamples/HttpServer/Program.cs +++ b/Networking/NetworkingSamples/HttpServer/Program.cs @@ -39,19 +39,18 @@ public static async Task StartServerAsync(params string[] prefixes) WriteLine($"server starting at"); var listener = new WebListener(); + foreach (var prefix in prefixes) { - listener.UrlPrefixes.Add(prefix); + listener.Settings.UrlPrefixes.Add(prefix); WriteLine($"\t{prefix}"); } listener.Start(); - do { - - using (RequestContext context = await listener.GetContextAsync()) + using (RequestContext context = await listener.AcceptAsync()) { context.Response.Headers.Add("content-type", new string[] { "text/html" }); context.Response.StatusCode = (int)HttpStatusCode.OK; diff --git a/Networking/NetworkingSamples/HttpServer/Properties/launchSettings.json b/Networking/NetworkingSamples/HttpServer/Properties/launchSettings.json index 6dccfe18..7e56d01c 100644 --- a/Networking/NetworkingSamples/HttpServer/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/HttpServer/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "HttpServer": { - "commandName": "HttpServer", + "commandName": "Project", "commandLineArgs": "http://+:8082/samples" } } diff --git a/Networking/NetworkingSamples/HttpServer/project.json b/Networking/NetworkingSamples/HttpServer/project.json deleted file mode 100644 index e1b33f29..00000000 --- a/Networking/NetworkingSamples/HttpServer/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Net.Http.Server": "0.1.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/NetworkingSamples.sln b/Networking/NetworkingSamples/NetworkingSamples.sln index d7f96f81..e4d5df98 100644 --- a/Networking/NetworkingSamples/NetworkingSamples.sln +++ b/Networking/NetworkingSamples/NetworkingSamples.sln @@ -1,47 +1,44 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpClientSample", "HttpClientSample\HttpClientSample.xproj", "{BFB1969A-4996-40D3-9C62-2C246551325A}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DnsLookup", "DnsLookup\DnsLookup.xproj", "{03D1B0C3-59A2-4A8F-BDCA-1C2A62C964EB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HTTP", "HTTP", "{62F9A8A8-8122-4671-B37E-A5F4BE8A97E6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TCP", "TCP", "{6F8E62B4-7D0C-4B94-98E1-918E25749857}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpServer", "HttpServer\HttpServer.xproj", "{033AF70E-2660-4E6A-8743-1184102F8D98}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sockets", "Sockets", "{7E39DCCF-688C-40E0-97E5-98C0ABCE6120}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Utilities", "Utilities\Utilities.xproj", "{13EACFD6-A311-4A9E-9769-7C528F578971}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UDP", "UDP", "{23FC629D-19D0-4094-80FE-B96F406EB8AF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TcpServer", "TcpServer\TcpServer.xproj", "{06E885D0-D3FE-447D-8721-DA633D2A2DB9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FC2D3C7C-43B9-49A6-95DC-167B350FD481}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TcpClientSample", "TcpClientSample\TcpClientSample.xproj", "{B4916D2C-2AF9-4F3B-9156-AE5F44F3EB59}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClientSample", "HttpClientSample\HttpClientSample.csproj", "{BFB1969A-4996-40D3-9C62-2C246551325A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sockets", "Sockets", "{7E39DCCF-688C-40E0-97E5-98C0ABCE6120}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DnsLookup", "DnsLookup\DnsLookup.csproj", "{03D1B0C3-59A2-4A8F-BDCA-1C2A62C964EB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SocketServer", "SocketServer\SocketServer.xproj", "{8C653762-FEB6-4CFA-8E62-15264F999B68}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpServer", "HttpServer\HttpServer.csproj", "{033AF70E-2660-4E6A-8743-1184102F8D98}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SocketClient", "SocketClient\SocketClient.xproj", "{8CB6C8C1-3C0B-4FFF-9BEC-3B04180D9DCB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities", "Utilities\Utilities.csproj", "{13EACFD6-A311-4A9E-9769-7C528F578971}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UDP", "UDP", "{23FC629D-19D0-4094-80FE-B96F406EB8AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TcpServer", "TcpServer\TcpServer.csproj", "{06E885D0-D3FE-447D-8721-DA633D2A2DB9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TcpClientSample", "TcpClientSample\TcpClientSample.csproj", "{B4916D2C-2AF9-4F3B-9156-AE5F44F3EB59}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketServer", "SocketServer\SocketServer.csproj", "{8C653762-FEB6-4CFA-8E62-15264F999B68}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UdpReceiver", "UdpReceiver\UdpReceiver.xproj", "{670B15A2-C7D2-4A0A-B56E-8E1B5511C194}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketClient", "SocketClient\SocketClient.csproj", "{8CB6C8C1-3C0B-4FFF-9BEC-3B04180D9DCB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UdpSender", "UdpSender\UdpSender.xproj", "{E16A29C3-161D-4C69-B560-B927FA4AD99B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UdpReceiver", "UdpReceiver\UdpReceiver.csproj", "{670B15A2-C7D2-4A0A-B56E-8E1B5511C194}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UdpSender", "UdpSender\UdpSender.csproj", "{E16A29C3-161D-4C69-B560-B927FA4AD99B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAppHttpClient", "WinAppHttpClient\WinAppHttpClient.csproj", "{ABF31C7A-A848-4D8C-BE81-2DC6DB959D27}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpClientUsingTcp", "HttpClientUsingTcp\HttpClientUsingTcp.xproj", "{0891BD03-3159-4791-BE8E-8E619B58AFB9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClientUsingTcp", "HttpClientUsingTcp\HttpClientUsingTcp.csproj", "{0891BD03-3159-4791-BE8E-8E619B58AFB9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFAppTcpClient", "WPFAppTcpClient\WPFAppTcpClient.csproj", "{108D5D89-61F8-461D-8841-800CC5BC52EA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FC2D3C7C-43B9-49A6-95DC-167B350FD481}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Networking/NetworkingSamples/SocketClient/Properties/launchSettings.json b/Networking/NetworkingSamples/SocketClient/Properties/launchSettings.json index dfe150d1..4fe7258e 100644 --- a/Networking/NetworkingSamples/SocketClient/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/SocketClient/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "SocketClient": { - "commandName": "SocketClient", + "commandName": "Project", "commandLineArgs": "localhost 9200" } } diff --git a/Networking/NetworkingSamples/SocketClient/SocketClient.csproj b/Networking/NetworkingSamples/SocketClient/SocketClient.csproj new file mode 100644 index 00000000..bbf7292a --- /dev/null +++ b/Networking/NetworkingSamples/SocketClient/SocketClient.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + SocketClient + Exe + SocketClient + + + diff --git a/Networking/NetworkingSamples/SocketClient/SocketClient.xproj b/Networking/NetworkingSamples/SocketClient/SocketClient.xproj deleted file mode 100644 index 690b36c7..00000000 --- a/Networking/NetworkingSamples/SocketClient/SocketClient.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8cb6c8c1-3c0b-4fff-9bec-3b04180d9dcb - SocketClient - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/SocketClient/project.json b/Networking/NetworkingSamples/SocketClient/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/SocketClient/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/SocketServer/Program.cs b/Networking/NetworkingSamples/SocketServer/Program.cs index 2e254b78..a3642571 100644 --- a/Networking/NetworkingSamples/SocketServer/Program.cs +++ b/Networking/NetworkingSamples/SocketServer/Program.cs @@ -78,7 +78,6 @@ public static void Listener(int port) WriteLine("Press return to exit"); ReadLine(); cts.Cancel(); - } private static Task CommunicateWithClientUsingSocketAsync(Socket socket) @@ -89,7 +88,6 @@ private static Task CommunicateWithClientUsingSocketAsync(Socket socket) { using (socket) { - bool completed = false; do { @@ -185,8 +183,6 @@ private static async Task CommunicateWithClientUsingReadersAndWritersAsync(Socke { WriteLine(ex.Message); } - } - } -} +} \ No newline at end of file diff --git a/Networking/NetworkingSamples/SocketServer/Properties/launchSettings.json b/Networking/NetworkingSamples/SocketServer/Properties/launchSettings.json index 9ca342f0..e99cd4a7 100644 --- a/Networking/NetworkingSamples/SocketServer/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/SocketServer/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "SocketServer": { - "commandName": "SocketServer", + "commandName": "Project", "commandLineArgs": "9200" } } diff --git a/Networking/NetworkingSamples/SocketServer/SocketServer.csproj b/Networking/NetworkingSamples/SocketServer/SocketServer.csproj new file mode 100644 index 00000000..30b5606c --- /dev/null +++ b/Networking/NetworkingSamples/SocketServer/SocketServer.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + SocketServer + Exe + SocketServer + + + diff --git a/Networking/NetworkingSamples/SocketServer/SocketServer.xproj b/Networking/NetworkingSamples/SocketServer/SocketServer.xproj deleted file mode 100644 index 458bfecc..00000000 --- a/Networking/NetworkingSamples/SocketServer/SocketServer.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8c653762-feb6-4cfa-8e62-15264f999b68 - SocketServer - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/SocketServer/project.json b/Networking/NetworkingSamples/SocketServer/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/SocketServer/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/TcpClientSample/Program.cs b/Networking/NetworkingSamples/TcpClientSample/Program.cs index 1fec5f64..6a102598 100644 --- a/Networking/NetworkingSamples/TcpClientSample/Program.cs +++ b/Networking/NetworkingSamples/TcpClientSample/Program.cs @@ -42,10 +42,8 @@ public static async Task SendAndReceive() } while (line != "bye"); WriteLine("so long, and thanks for all the fish"); - } - } - + } } } } diff --git a/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.csproj b/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.csproj new file mode 100644 index 00000000..1a20e394 --- /dev/null +++ b/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + TcpClientSample + Exe + TcpClientSample + + + diff --git a/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.xproj b/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.xproj deleted file mode 100644 index 5d710d9f..00000000 --- a/Networking/NetworkingSamples/TcpClientSample/TcpClientSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b4916d2c-2af9-4f3b-9156-ae5f44f3eb59 - TcpClientSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/TcpClientSample/project.json b/Networking/NetworkingSamples/TcpClientSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/TcpClientSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/TcpServer/TcpServer.csproj b/Networking/NetworkingSamples/TcpServer/TcpServer.csproj new file mode 100644 index 00000000..b08acb70 --- /dev/null +++ b/Networking/NetworkingSamples/TcpServer/TcpServer.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + TcpServer + Exe + TcpServer + + + diff --git a/Networking/NetworkingSamples/TcpServer/TcpServer.xproj b/Networking/NetworkingSamples/TcpServer/TcpServer.xproj deleted file mode 100644 index c0eb45db..00000000 --- a/Networking/NetworkingSamples/TcpServer/TcpServer.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 06e885d0-d3fe-447d-8721-da633d2a2db9 - TcpServer - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/TcpServer/project.json b/Networking/NetworkingSamples/TcpServer/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/TcpServer/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/UdpReceiver/Properties/launchSettings.json b/Networking/NetworkingSamples/UdpReceiver/Properties/launchSettings.json index cd3a1920..51365824 100644 --- a/Networking/NetworkingSamples/UdpReceiver/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/UdpReceiver/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "UdpReceiver": { - "commandName": "UdpReceiver", + "commandName": "Project", "commandLineArgs": "-p 9400 -g ff05::1 -ipv6" } } diff --git a/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.csproj b/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.csproj new file mode 100644 index 00000000..744d3936 --- /dev/null +++ b/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + UdpReceiver + Exe + UdpReceiver + + + diff --git a/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.xproj b/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.xproj deleted file mode 100644 index aefc681a..00000000 --- a/Networking/NetworkingSamples/UdpReceiver/UdpReceiver.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 670b15a2-c7d2-4a0a-b56e-8e1b5511c194 - UdpReceiver - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/UdpReceiver/project.json b/Networking/NetworkingSamples/UdpReceiver/project.json deleted file mode 100644 index 03f6b014..00000000 --- a/Networking/NetworkingSamples/UdpReceiver/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - - } -} diff --git a/Networking/NetworkingSamples/UdpSender/UdpSender.csproj b/Networking/NetworkingSamples/UdpSender/UdpSender.csproj new file mode 100644 index 00000000..cace9285 --- /dev/null +++ b/Networking/NetworkingSamples/UdpSender/UdpSender.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + UdpSender + Exe + UdpSender + + + diff --git a/Networking/NetworkingSamples/UdpSender/UdpSender.xproj b/Networking/NetworkingSamples/UdpSender/UdpSender.xproj deleted file mode 100644 index 06a2fbe5..00000000 --- a/Networking/NetworkingSamples/UdpSender/UdpSender.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e16a29c3-161d-4c69-b560-b927fa4ad99b - UdpSender - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/UdpSender/project.json b/Networking/NetworkingSamples/UdpSender/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/UdpSender/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/Utilities/Program.cs b/Networking/NetworkingSamples/Utilities/Program.cs index 743cbb62..9967907e 100644 --- a/Networking/NetworkingSamples/Utilities/Program.cs +++ b/Networking/NetworkingSamples/Utilities/Program.cs @@ -37,8 +37,7 @@ private static void ShowUsage() } public static void IPAddressSample(string ipAddressString) - { - + { IPAddress address; if (!IPAddress.TryParse(ipAddressString, out address)) { @@ -86,6 +85,4 @@ public static void UriSample(string url) WriteLine(uri); } } - - } diff --git a/Networking/NetworkingSamples/Utilities/Properties/launchSettings.json b/Networking/NetworkingSamples/Utilities/Properties/launchSettings.json index 19332db9..af5568d5 100644 --- a/Networking/NetworkingSamples/Utilities/Properties/launchSettings.json +++ b/Networking/NetworkingSamples/Utilities/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "Utilities": { - "commandName": "Utilities", + "commandName": "Project", "commandLineArgs": "ipaddress 65.52.128.33" } } diff --git a/Networking/NetworkingSamples/Utilities/Utilities.csproj b/Networking/NetworkingSamples/Utilities/Utilities.csproj new file mode 100644 index 00000000..814644b5 --- /dev/null +++ b/Networking/NetworkingSamples/Utilities/Utilities.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp1.1 + Utilities + Exe + Utilities + + + diff --git a/Networking/NetworkingSamples/Utilities/Utilities.xproj b/Networking/NetworkingSamples/Utilities/Utilities.xproj deleted file mode 100644 index 2a92e11d..00000000 --- a/Networking/NetworkingSamples/Utilities/Utilities.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 13eacfd6-a311-4a9e-9769-7c528f578971 - Utilities - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/Utilities/project.json b/Networking/NetworkingSamples/Utilities/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/Networking/NetworkingSamples/Utilities/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.props b/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.props new file mode 100644 index 00000000..c0b06875 --- /dev/null +++ b/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.props @@ -0,0 +1,21 @@ + + + + True + NuGet + C:\githubvs2017\ProfessionalCSharp6\Networking\NetworkingSamples\WinAppHttpClient\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\chris\.nuget\packages\ + ProjectJson + 4.0.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.targets b/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.targets new file mode 100644 index 00000000..b0400075 --- /dev/null +++ b/Networking/NetworkingSamples/WinAppHttpClient/WinAppHttpClient.nuget.targets @@ -0,0 +1,12 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/Networking/NetworkingSamples/WinAppHttpClient/project.json b/Networking/NetworkingSamples/WinAppHttpClient/project.json index 32d92747..91b3dfc8 100644 --- a/Networking/NetworkingSamples/WinAppHttpClient/project.json +++ b/Networking/NetworkingSamples/WinAppHttpClient/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" + "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1" }, "frameworks": { "uap10.0": {} diff --git a/Networking/NetworkingSamples/global.json b/Networking/NetworkingSamples/global.json deleted file mode 100644 index 1a187fd8..00000000 --- a/Networking/NetworkingSamples/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "projects": [ - "." - ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} \ No newline at end of file From 1b427cd8d4bc1dff517193caf2b10c8b588ad204 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Fri, 10 Mar 2017 19:55:05 +0100 Subject: [PATCH 39/90] remove test project --- .../NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj | 8 -------- Networking/NetworkingSamples/ConsoleApp1/Program.cs | 12 ------------ 2 files changed, 20 deletions(-) delete mode 100644 Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj delete mode 100644 Networking/NetworkingSamples/ConsoleApp1/Program.cs diff --git a/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj b/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj deleted file mode 100644 index 6d25f413..00000000 --- a/Networking/NetworkingSamples/ConsoleApp1/ConsoleApp1.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exe - netcoreapp1.1 - - - \ No newline at end of file diff --git a/Networking/NetworkingSamples/ConsoleApp1/Program.cs b/Networking/NetworkingSamples/ConsoleApp1/Program.cs deleted file mode 100644 index be1b5acd..00000000 --- a/Networking/NetworkingSamples/ConsoleApp1/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace ConsoleApp1 -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} \ No newline at end of file From d333208f64b05450b800614590e269284bcc5943 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Fri, 10 Mar 2017 23:13:50 +0100 Subject: [PATCH 40/90] XML and JSON #27 #29 --- .../JsonSample/JsonSample.csproj | 12 +++++++++ .../JsonSample/JsonSample.xproj | 18 ------------- .../XMLandJSONSamples/JsonSample/project.json | 22 --------------- .../LinqToXmlSample/LinqToXmlSample.csproj | 12 +++++++++ .../LinqToXmlSample/LinqToXmlSample.xproj | 18 ------------- .../LinqToXmlSample/project.json | 23 ---------------- .../ObjectToXmlSerializationSample.csproj | 12 +++++++++ .../ObjectToXmlSerializationSample.xproj | 18 ------------- .../project.json | 23 ---------------- ...bjectToXmlSerializationWOAttributes.csproj | 12 +++++++++ ...ObjectToXmlSerializationWOAttributes.xproj | 18 ------------- .../project.json | 22 --------------- .../XMLandJSONSamples/XMLandJSONSamples.sln | 23 +++++++--------- .../XPathNavigatorSample.csproj | 22 +++++++++++++++ .../XPathNavigatorSample.xproj | 18 ------------- .../XPathNavigatorSample/project.json | 27 ------------------- .../XmlDocumentSample.csproj | 12 +++++++++ .../XmlDocumentSample/XmlDocumentSample.xproj | 18 ------------- .../XmlDocumentSample/project.json | 22 --------------- .../XmlReaderAndWriterSample.csproj | 8 ++++++ .../XmlReaderAndWriterSample.xproj | 18 ------------- .../XmlReaderAndWriterSample/project.json | 21 --------------- XMLandJSON/XMLandJSONSamples/global.json | 8 ------ 23 files changed, 100 insertions(+), 307 deletions(-) create mode 100644 XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/JsonSample/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/LinqToXmlSample/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XmlDocumentSample/project.json create mode 100644 XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.csproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.xproj delete mode 100644 XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/project.json delete mode 100644 XMLandJSON/XMLandJSONSamples/global.json diff --git a/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.csproj b/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.csproj new file mode 100644 index 00000000..53a7f0da --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.xproj b/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.xproj deleted file mode 100644 index 0a334038..00000000 --- a/XMLandJSON/XMLandJSONSamples/JsonSample/JsonSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 40bb40f6-ea0f-42fc-8bd1-a94b43932a66 - JsonSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/JsonSample/project.json b/XMLandJSON/XMLandJSONSamples/JsonSample/project.json deleted file mode 100644 index af3569fa..00000000 --- a/XMLandJSON/XMLandJSONSamples/JsonSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Newtonsoft.Json": "9.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.csproj b/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.csproj new file mode 100644 index 00000000..c77c4083 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.xproj b/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.xproj deleted file mode 100644 index ae19a10f..00000000 --- a/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/LinqToXmlSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 626afbeb-ee84-4791-9fdb-4d3e0fac0945 - LinqToXmlSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/project.json b/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/project.json deleted file mode 100644 index ed8b2f6a..00000000 --- a/XMLandJSON/XMLandJSONSamples/LinqToXmlSample/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - - "dependencies": { - "System.Net.Http": "4.3.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.csproj b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.csproj new file mode 100644 index 00000000..1fadd6a7 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.xproj b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.xproj deleted file mode 100644 index 1bdda40e..00000000 --- a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/ObjectToXmlSerializationSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 37693abe-f98a-45ad-8b05-80b3ef342d75 - ObjectToXmlSerializationSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/project.json b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/project.json deleted file mode 100644 index 3186deb6..00000000 --- a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationSample/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Xml.XmlSerializer": "4.0.11" - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.csproj b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.csproj new file mode 100644 index 00000000..1fadd6a7 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.xproj b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.xproj deleted file mode 100644 index c881e649..00000000 --- a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/ObjectToXmlSerializationWOAttributes.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4f23a421-a8f9-42a3-85d3-e36c1cf62321 - ObjectToXmlSerializationWOAttributes - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/project.json b/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/project.json deleted file mode 100644 index d800dfd2..00000000 --- a/XMLandJSON/XMLandJSONSamples/ObjectToXmlSerializationWOAttributes/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Xml.XmlSerializer": "4.0.11" - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/XMLandJSONSamples.sln b/XMLandJSON/XMLandJSONSamples/XMLandJSONSamples.sln index 9078d9f9..706a051f 100644 --- a/XMLandJSON/XMLandJSONSamples/XMLandJSONSamples.sln +++ b/XMLandJSON/XMLandJSONSamples/XMLandJSONSamples.sln @@ -1,26 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XmlDocumentSample", "XmlDocumentSample\XmlDocumentSample.xproj", "{9E4D60F9-286C-4971-BECB-C75315AE60CB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7E01E6BF-6098-4BB2-84A6-DB61ED4C7A3F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XPathNavigatorSample", "XPathNavigatorSample\XPathNavigatorSample.xproj", "{0C066E84-0DAB-4E8F-BA80-464B16BE8D58}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocumentSample", "XmlDocumentSample\XmlDocumentSample.csproj", "{9E4D60F9-286C-4971-BECB-C75315AE60CB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ObjectToXmlSerializationSample", "ObjectToXmlSerializationSample\ObjectToXmlSerializationSample.xproj", "{37693ABE-F98A-45AD-8B05-80B3EF342D75}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XPathNavigatorSample", "XPathNavigatorSample\XPathNavigatorSample.csproj", "{0C066E84-0DAB-4E8F-BA80-464B16BE8D58}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ObjectToXmlSerializationWOAttributes", "ObjectToXmlSerializationWOAttributes\ObjectToXmlSerializationWOAttributes.xproj", "{4F23A421-A8F9-42A3-85D3-E36C1CF62321}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectToXmlSerializationSample", "ObjectToXmlSerializationSample\ObjectToXmlSerializationSample.csproj", "{37693ABE-F98A-45AD-8B05-80B3EF342D75}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqToXmlSample", "LinqToXmlSample\LinqToXmlSample.xproj", "{626AFBEB-EE84-4791-9FDB-4D3E0FAC0945}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectToXmlSerializationWOAttributes", "ObjectToXmlSerializationWOAttributes\ObjectToXmlSerializationWOAttributes.csproj", "{4F23A421-A8F9-42A3-85D3-E36C1CF62321}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XmlReaderAndWriterSample", "XmlReaderAndWriterSample\XmlReaderAndWriterSample.xproj", "{B746A64F-FDE5-4AC6-9336-81EA2CB24229}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToXmlSample", "LinqToXmlSample\LinqToXmlSample.csproj", "{626AFBEB-EE84-4791-9FDB-4D3E0FAC0945}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JsonSample", "JsonSample\JsonSample.xproj", "{40BB40F6-EA0F-42FC-8BD1-A94B43932A66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlReaderAndWriterSample", "XmlReaderAndWriterSample\XmlReaderAndWriterSample.csproj", "{B746A64F-FDE5-4AC6-9336-81EA2CB24229}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7E01E6BF-6098-4BB2-84A6-DB61ED4C7A3F}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonSample", "JsonSample\JsonSample.csproj", "{40BB40F6-EA0F-42FC-8BD1-A94B43932A66}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.csproj b/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.csproj new file mode 100644 index 00000000..38c0b189 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp1.1 + Exe + XPathNavigatorSample + + + + + + + + + $(DefineConstants);NETCORE + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.xproj b/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.xproj deleted file mode 100644 index 5079249a..00000000 --- a/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/XPathNavigatorSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0c066e84-0dab-4e8f-ba80-464b16be8d58 - XPathNavigatorSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/project.json b/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/project.json deleted file mode 100644 index e369a740..00000000 --- a/XMLandJSON/XMLandJSONSamples/XPathNavigatorSample/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.Xml.XmlDocument": "4.0.1", - "System.Xml.XPath": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ "NETCORE" ] - }, - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Xml.XmlSerializer": "4.0.11" - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.csproj b/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.csproj new file mode 100644 index 00000000..dcdba7c1 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Exe + + + + + + + diff --git a/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.xproj b/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.xproj deleted file mode 100644 index 94117d96..00000000 --- a/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/XmlDocumentSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9e4d60f9-286c-4971-becb-c75315ae60cb - XmlDocumentSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/project.json b/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/project.json deleted file mode 100644 index e5314f69..00000000 --- a/XMLandJSON/XMLandJSONSamples/XmlDocumentSample/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "System.Xml.XmlDocument": "4.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.csproj b/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.csproj new file mode 100644 index 00000000..56099a65 --- /dev/null +++ b/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.csproj @@ -0,0 +1,8 @@ + + + + netcoreapp1.1 + Exe + + + diff --git a/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.xproj b/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.xproj deleted file mode 100644 index 0081f6e3..00000000 --- a/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/XmlReaderAndWriterSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b746a64f-fde5-4ac6-9336-81ea2cb24229 - XmlReaderAndWriterSample - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/project.json b/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/project.json deleted file mode 100644 index 6d8f3b09..00000000 --- a/XMLandJSON/XMLandJSONSamples/XmlReaderAndWriterSample/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/XMLandJSON/XMLandJSONSamples/global.json b/XMLandJSON/XMLandJSONSamples/global.json deleted file mode 100644 index 1a187fd8..00000000 --- a/XMLandJSON/XMLandJSONSamples/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "projects": [ - "." - ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} \ No newline at end of file From 03eda3a46c997edf7bf0b98b4e13488fbe318012 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Wed, 5 Apr 2017 11:20:17 +0200 Subject: [PATCH 41/90] Web API #27 #29 --- .../BooksServiceSample/BooksServiceSample.sln | 10 ++-- .../BookServiceAsyncSample.csproj | 28 +++++++++ .../BookServiceAsyncSample.xproj | 18 ------ .../src/BookServiceAsyncSample/project.json | 59 ------------------- .../runtimeconfig.template.json | 3 + .../BookServiceClientApp.csproj | 12 ++++ .../BookServiceClientApp.xproj | 18 ------ .../Properties/AssemblyInfo.cs | 23 -------- .../src/BookServiceClientApp/project.json | 21 ------- .../BooksServiceSample.csproj | 26 ++++++++ .../BooksServiceSample.xproj | 18 ------ .../src/BooksServiceSample/project.json | 56 ------------------ .../runtimeconfig.template.json | 3 + 13 files changed, 77 insertions(+), 218 deletions(-) create mode 100644 WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.csproj delete mode 100644 WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.xproj delete mode 100644 WebAPI/BooksServiceSample/src/BookServiceAsyncSample/project.json create mode 100644 WebAPI/BooksServiceSample/src/BookServiceAsyncSample/runtimeconfig.template.json create mode 100644 WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.csproj delete mode 100644 WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.xproj delete mode 100644 WebAPI/BooksServiceSample/src/BookServiceClientApp/Properties/AssemblyInfo.cs delete mode 100644 WebAPI/BooksServiceSample/src/BookServiceClientApp/project.json create mode 100644 WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.csproj delete mode 100644 WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.xproj delete mode 100644 WebAPI/BooksServiceSample/src/BooksServiceSample/project.json create mode 100644 WebAPI/BooksServiceSample/src/BooksServiceSample/runtimeconfig.template.json diff --git a/WebAPI/BooksServiceSample/BooksServiceSample.sln b/WebAPI/BooksServiceSample/BooksServiceSample.sln index 7c189d2d..dfd11619 100644 --- a/WebAPI/BooksServiceSample/BooksServiceSample.sln +++ b/WebAPI/BooksServiceSample/BooksServiceSample.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{00B75FDC-B961-4332-A91C-E27D004EA515}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{515B7233-7440-4088-9309-9978C529A9B4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BooksServiceSample", "src\BooksServiceSample\BooksServiceSample.xproj", "{135F3013-0B6B-40A9-8ADC-AD7EF5A8C716}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BooksServiceSample", "src\BooksServiceSample\BooksServiceSample.csproj", "{135F3013-0B6B-40A9-8ADC-AD7EF5A8C716}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BookServiceClientApp", "src\BookServiceClientApp\BookServiceClientApp.xproj", "{4B49B48B-CB07-4937-A0BD-4962C9ED8400}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookServiceClientApp", "src\BookServiceClientApp\BookServiceClientApp.csproj", "{4B49B48B-CB07-4937-A0BD-4962C9ED8400}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BookServiceAsyncSample", "src\BookServiceAsyncSample\BookServiceAsyncSample.xproj", "{50B32B42-1C50-424D-98F5-CD5DBBFF2695}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookServiceAsyncSample", "src\BookServiceAsyncSample\BookServiceAsyncSample.csproj", "{50B32B42-1C50-424D-98F5-CD5DBBFF2695}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.csproj b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.csproj new file mode 100644 index 00000000..f8d13fb4 --- /dev/null +++ b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.csproj @@ -0,0 +1,28 @@ + + + + netcoreapp1.1 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.xproj b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.xproj deleted file mode 100644 index 177cce43..00000000 --- a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/BookServiceAsyncSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 50b32b42-1c50-424d-98f5-cd5dbbff2695 - BookServiceSample - ..\..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/project.json b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/project.json deleted file mode 100644 index f28afe61..00000000 --- a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/project.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.1", - "type": "platform" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.EntityFrameworkCore": "1.0.1", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1" - }, - - "tools": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "dnxcore50", - "portable-net45+win8" - ] - } - }, - - - - "runtimeOptions": { - "gcServer": true - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/runtimeconfig.template.json b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/runtimeconfig.template.json new file mode 100644 index 00000000..3dc8eba7 --- /dev/null +++ b/WebAPI/BooksServiceSample/src/BookServiceAsyncSample/runtimeconfig.template.json @@ -0,0 +1,3 @@ +{ + "gcServer": true +} \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.csproj b/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.csproj new file mode 100644 index 00000000..53da8380 --- /dev/null +++ b/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.csproj @@ -0,0 +1,12 @@ + + + + Exe + netcoreapp1.1 + + + + + + + \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.xproj b/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.xproj deleted file mode 100644 index 07e8951f..00000000 --- a/WebAPI/BooksServiceSample/src/BookServiceClientApp/BookServiceClientApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4b49b48b-cb07-4937-a0bd-4962c9ed8400 - BookServiceClientApp - ..\..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BookServiceClientApp/Properties/AssemblyInfo.cs b/WebAPI/BooksServiceSample/src/BookServiceClientApp/Properties/AssemblyInfo.cs deleted file mode 100644 index 9ee57efc..00000000 --- a/WebAPI/BooksServiceSample/src/BookServiceClientApp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +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("BookServiceClientApp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BookServiceClientApp")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("4b49b48b-cb07-4937-a0bd-4962c9ed8400")] diff --git a/WebAPI/BooksServiceSample/src/BookServiceClientApp/project.json b/WebAPI/BooksServiceSample/src/BookServiceClientApp/project.json deleted file mode 100644 index a10328d9..00000000 --- a/WebAPI/BooksServiceSample/src/BookServiceClientApp/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.1", - "type": "platform" - }, - "Newtonsoft.Json": "9.0.1" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50" - } - } - -} \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.csproj b/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.csproj new file mode 100644 index 00000000..ee95bc5e --- /dev/null +++ b/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.csproj @@ -0,0 +1,26 @@ + + + + netcoreapp1.1 + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.xproj b/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.xproj deleted file mode 100644 index 719837e5..00000000 --- a/WebAPI/BooksServiceSample/src/BooksServiceSample/BooksServiceSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 135f3013-0b6b-40a9-8adc-ad7ef5a8c716 - BooksServiceSample - ..\..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BooksServiceSample/project.json b/WebAPI/BooksServiceSample/src/BooksServiceSample/project.json deleted file mode 100644 index b0c7e918..00000000 --- a/WebAPI/BooksServiceSample/src/BooksServiceSample/project.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.1", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Swashbuckle": "6.0.0-beta902" - }, - - "tools": { - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "dnxcore50", - "portable-net45+win8" - ] - } - }, - - "runtimeOptions": { - "gcServer": true - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } - } \ No newline at end of file diff --git a/WebAPI/BooksServiceSample/src/BooksServiceSample/runtimeconfig.template.json b/WebAPI/BooksServiceSample/src/BooksServiceSample/runtimeconfig.template.json new file mode 100644 index 00000000..3dc8eba7 --- /dev/null +++ b/WebAPI/BooksServiceSample/src/BooksServiceSample/runtimeconfig.template.json @@ -0,0 +1,3 @@ +{ + "gcServer": true +} \ No newline at end of file From 08759430784b6e36880adc4f19829958208d9cd0 Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Wed, 5 Apr 2017 11:26:51 +0200 Subject: [PATCH 42/90] ADO.NET #27 #29 --- ADONET/ADONetSamples/ADONetSamples.sln | 12 +++++----- .../AsyncSamples/AsyncSamples.csproj | 14 +++++++++++ .../AsyncSamples/AsyncSamples.xproj | 18 -------------- .../ADONetSamples/AsyncSamples/project.json | 24 ------------------- .../CommandSamples/CommandSamples.csproj | 14 +++++++++++ .../CommandSamples/CommandSamples.xproj | 18 -------------- .../ADONetSamples/CommandSamples/project.json | 24 ------------------- .../ConnectionSamples.csproj | 14 +++++++++++ .../ConnectionSamples/ConnectionSamples.xproj | 18 -------------- .../ConnectionSamples/project.json | 24 ------------------- .../TransactionSamples.csproj | 14 +++++++++++ .../TransactionSamples.xproj | 18 -------------- .../TransactionSamples/project.json | 24 ------------------- 13 files changed, 62 insertions(+), 174 deletions(-) create mode 100644 ADONET/ADONetSamples/AsyncSamples/AsyncSamples.csproj delete mode 100644 ADONET/ADONetSamples/AsyncSamples/AsyncSamples.xproj delete mode 100644 ADONET/ADONetSamples/AsyncSamples/project.json create mode 100644 ADONET/ADONetSamples/CommandSamples/CommandSamples.csproj delete mode 100644 ADONET/ADONetSamples/CommandSamples/CommandSamples.xproj delete mode 100644 ADONET/ADONetSamples/CommandSamples/project.json create mode 100644 ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.csproj delete mode 100644 ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.xproj delete mode 100644 ADONET/ADONetSamples/ConnectionSamples/project.json create mode 100644 ADONET/ADONetSamples/TransactionSamples/TransactionSamples.csproj delete mode 100644 ADONET/ADONetSamples/TransactionSamples/TransactionSamples.xproj delete mode 100644 ADONET/ADONetSamples/TransactionSamples/project.json diff --git a/ADONET/ADONetSamples/ADONetSamples.sln b/ADONET/ADONetSamples/ADONetSamples.sln index 886e1da9..f94cb558 100644 --- a/ADONET/ADONetSamples/ADONetSamples.sln +++ b/ADONET/ADONetSamples/ADONetSamples.sln @@ -1,15 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConnectionSamples", "ConnectionSamples\ConnectionSamples.xproj", "{34B7F9FF-2AC7-45AC-AB9F-A909122435CE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectionSamples", "ConnectionSamples\ConnectionSamples.csproj", "{34B7F9FF-2AC7-45AC-AB9F-A909122435CE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandSamples", "CommandSamples\CommandSamples.xproj", "{761B0AB6-A017-46F1-8DEE-71B979920584}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandSamples", "CommandSamples\CommandSamples.csproj", "{761B0AB6-A017-46F1-8DEE-71B979920584}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AsyncSamples", "AsyncSamples\AsyncSamples.xproj", "{022F04F8-A133-4F13-8CCC-331A61573B70}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncSamples", "AsyncSamples\AsyncSamples.csproj", "{022F04F8-A133-4F13-8CCC-331A61573B70}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TransactionSamples", "TransactionSamples\TransactionSamples.xproj", "{2FF75228-D5F4-495D-B787-74EC71D9CD33}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionSamples", "TransactionSamples\TransactionSamples.csproj", "{2FF75228-D5F4-495D-B787-74EC71D9CD33}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.csproj b/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.csproj new file mode 100644 index 00000000..7f82b99f --- /dev/null +++ b/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.csproj @@ -0,0 +1,14 @@ + + + + Exe + netcoreapp1.1 + + + + + + + + + \ No newline at end of file diff --git a/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.xproj b/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.xproj deleted file mode 100644 index 0d637d0a..00000000 --- a/ADONET/ADONetSamples/AsyncSamples/AsyncSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 022f04f8-a133-4f13-8ccc-331a61573b70 - AsyncSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ADONET/ADONetSamples/AsyncSamples/project.json b/ADONET/ADONetSamples/AsyncSamples/project.json deleted file mode 100644 index 3d2b2065..00000000 --- a/ADONET/ADONetSamples/AsyncSamples/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "system.data.sqlclient": "4.1.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ADONET/ADONetSamples/CommandSamples/CommandSamples.csproj b/ADONET/ADONetSamples/CommandSamples/CommandSamples.csproj new file mode 100644 index 00000000..7f82b99f --- /dev/null +++ b/ADONET/ADONetSamples/CommandSamples/CommandSamples.csproj @@ -0,0 +1,14 @@ + + + + Exe + netcoreapp1.1 + + + + + + + + + \ No newline at end of file diff --git a/ADONET/ADONetSamples/CommandSamples/CommandSamples.xproj b/ADONET/ADONetSamples/CommandSamples/CommandSamples.xproj deleted file mode 100644 index 99f81b6a..00000000 --- a/ADONET/ADONetSamples/CommandSamples/CommandSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 761b0ab6-a017-46f1-8dee-71b979920584 - CommandSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ADONET/ADONetSamples/CommandSamples/project.json b/ADONET/ADONetSamples/CommandSamples/project.json deleted file mode 100644 index 0c6ae7b7..00000000 --- a/ADONET/ADONetSamples/CommandSamples/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "system.data.sqlclient": "4.1.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.csproj b/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.csproj new file mode 100644 index 00000000..7f82b99f --- /dev/null +++ b/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.csproj @@ -0,0 +1,14 @@ + + + + Exe + netcoreapp1.1 + + + + + + + + + \ No newline at end of file diff --git a/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.xproj b/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.xproj deleted file mode 100644 index 6f268a29..00000000 --- a/ADONET/ADONetSamples/ConnectionSamples/ConnectionSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 34b7f9ff-2ac7-45ac-ab9f-a909122435ce - ConnectionSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ADONET/ADONetSamples/ConnectionSamples/project.json b/ADONET/ADONetSamples/ConnectionSamples/project.json deleted file mode 100644 index 3d2b2065..00000000 --- a/ADONET/ADONetSamples/ConnectionSamples/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "system.data.sqlclient": "4.1.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} diff --git a/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.csproj b/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.csproj new file mode 100644 index 00000000..7f82b99f --- /dev/null +++ b/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.csproj @@ -0,0 +1,14 @@ + + + + Exe + netcoreapp1.1 + + + + + + + + + \ No newline at end of file diff --git a/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.xproj b/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.xproj deleted file mode 100644 index 00be01a6..00000000 --- a/ADONET/ADONetSamples/TransactionSamples/TransactionSamples.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2ff75228-d5f4-495d-b787-74ec71d9cd33 - TransactionSamples - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/ADONET/ADONetSamples/TransactionSamples/project.json b/ADONET/ADONetSamples/TransactionSamples/project.json deleted file mode 100644 index 3d2b2065..00000000 --- a/ADONET/ADONetSamples/TransactionSamples/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "system.data.sqlclient": "4.1.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - } - } -} From 8852a94b1e2a29b06d6a2f0e2c7664b3e2edc14d Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Wed, 5 Apr 2017 11:39:42 +0200 Subject: [PATCH 43/90] patterns - package updates --- Patterns/MVVM/BooksDesktopApp/App.config | 12 +++- Patterns/MVVM/BooksDesktopApp/App.xaml.cs | 2 +- .../BooksDesktopApp/BooksDesktopApp.csproj | 64 +++++++++++++++++-- Patterns/MVVM/BooksDesktopApp/packages.config | 63 ++++++++++++++---- .../BooksUniversalApp.nuget.props | 21 ++++++ .../BooksUniversalApp.nuget.targets | 12 ++++ Patterns/MVVM/BooksUniversalApp/project.json | 4 +- Patterns/MVVM/Contracts/project.json | 6 +- Patterns/MVVM/Framework/project.json | 2 +- Patterns/MVVM/Models/project.json | 6 +- Patterns/MVVM/Repositories/project.json | 2 +- Patterns/MVVM/Services/project.json | 2 +- Patterns/MVVM/ViewModels/project.json | 2 +- 13 files changed, 163 insertions(+), 35 deletions(-) create mode 100644 Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.props create mode 100644 Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.targets diff --git a/Patterns/MVVM/BooksDesktopApp/App.config b/Patterns/MVVM/BooksDesktopApp/App.config index 2d2a12d8..416e868e 100644 --- a/Patterns/MVVM/BooksDesktopApp/App.config +++ b/Patterns/MVVM/BooksDesktopApp/App.config @@ -1,6 +1,14 @@ - + - + + + + + + + + + diff --git a/Patterns/MVVM/BooksDesktopApp/App.xaml.cs b/Patterns/MVVM/BooksDesktopApp/App.xaml.cs index af1b0e9a..2242de8b 100644 --- a/Patterns/MVVM/BooksDesktopApp/App.xaml.cs +++ b/Patterns/MVVM/BooksDesktopApp/App.xaml.cs @@ -25,7 +25,7 @@ private IServiceProvider RegisterServices() serviceCollection.AddTransient(); serviceCollection.AddTransient(); serviceCollection.AddSingleton(); - // serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); return serviceCollection.BuildServiceProvider(); } diff --git a/Patterns/MVVM/BooksDesktopApp/BooksDesktopApp.csproj b/Patterns/MVVM/BooksDesktopApp/BooksDesktopApp.csproj index 464f07b0..540c772a 100644 --- a/Patterns/MVVM/BooksDesktopApp/BooksDesktopApp.csproj +++ b/Patterns/MVVM/BooksDesktopApp/BooksDesktopApp.csproj @@ -35,16 +35,65 @@ 4 - - ..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.1.1.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + + ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + + + + ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + + ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + + + + ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + + + ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + + + ..\packages\System.Net.Http.4.3.1\lib\net46\System.Net.Http.dll + + + ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll + @@ -53,6 +102,9 @@ 4.0 + + ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + diff --git a/Patterns/MVVM/BooksDesktopApp/packages.config b/Patterns/MVVM/BooksDesktopApp/packages.config index d58ae961..936e6321 100644 --- a/Patterns/MVVM/BooksDesktopApp/packages.config +++ b/Patterns/MVVM/BooksDesktopApp/packages.config @@ -1,17 +1,52 @@  - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.props b/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.props new file mode 100644 index 00000000..9a954846 --- /dev/null +++ b/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.props @@ -0,0 +1,21 @@ + + + + True + NuGet + C:\githubvs2017\ProfessionalCSharp6\Patterns\MVVM\BooksUniversalApp\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\chris\.nuget\packages\ + ProjectJson + 4.0.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.targets b/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.targets new file mode 100644 index 00000000..b0400075 --- /dev/null +++ b/Patterns/MVVM/BooksUniversalApp/BooksUniversalApp.nuget.targets @@ -0,0 +1,12 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + \ No newline at end of file diff --git a/Patterns/MVVM/BooksUniversalApp/project.json b/Patterns/MVVM/BooksUniversalApp/project.json index db5a35e0..f2ac0292 100644 --- a/Patterns/MVVM/BooksUniversalApp/project.json +++ b/Patterns/MVVM/BooksUniversalApp/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.Extensions.DependencyInjection": "1.0.0", - "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" + "Microsoft.Extensions.DependencyInjection": "1.1.0", + "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1" }, "frameworks": { "uap10.0": {} diff --git a/Patterns/MVVM/Contracts/project.json b/Patterns/MVVM/Contracts/project.json index f19f0da1..b06c001a 100644 --- a/Patterns/MVVM/Contracts/project.json +++ b/Patterns/MVVM/Contracts/project.json @@ -1,8 +1,8 @@ -{ +{ "supports": {}, "dependencies": { - "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1" + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} diff --git a/Patterns/MVVM/Framework/project.json b/Patterns/MVVM/Framework/project.json index 1d719cbf..b06c001a 100644 --- a/Patterns/MVVM/Framework/project.json +++ b/Patterns/MVVM/Framework/project.json @@ -2,7 +2,7 @@ "supports": {}, "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0" + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} diff --git a/Patterns/MVVM/Models/project.json b/Patterns/MVVM/Models/project.json index f19f0da1..b06c001a 100644 --- a/Patterns/MVVM/Models/project.json +++ b/Patterns/MVVM/Models/project.json @@ -1,8 +1,8 @@ -{ +{ "supports": {}, "dependencies": { - "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1" + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} diff --git a/Patterns/MVVM/Repositories/project.json b/Patterns/MVVM/Repositories/project.json index 1d719cbf..b06c001a 100644 --- a/Patterns/MVVM/Repositories/project.json +++ b/Patterns/MVVM/Repositories/project.json @@ -2,7 +2,7 @@ "supports": {}, "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0" + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} diff --git a/Patterns/MVVM/Services/project.json b/Patterns/MVVM/Services/project.json index 1d719cbf..b06c001a 100644 --- a/Patterns/MVVM/Services/project.json +++ b/Patterns/MVVM/Services/project.json @@ -2,7 +2,7 @@ "supports": {}, "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0" + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} diff --git a/Patterns/MVVM/ViewModels/project.json b/Patterns/MVVM/ViewModels/project.json index 1d719cbf..b06c001a 100644 --- a/Patterns/MVVM/ViewModels/project.json +++ b/Patterns/MVVM/ViewModels/project.json @@ -2,7 +2,7 @@ "supports": {}, "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0" + "NETStandard.Library": "1.6.1" }, "frameworks": { "netstandard1.3": {} From f1be839fdbc0140df407c836960fdcdcd3e503ce Mon Sep 17 00:00:00 2001 From: Christian Nagel Date: Wed, 5 Apr 2017 12:07:02 +0200 Subject: [PATCH 44/90] update for VS2017 --- DeploymentWeb/WebDotnetCore/WebDotnetCore.sln | 24 +-- .../{src => }/WebDotnetCore/.bowerrc | 0 .../Controllers/AccountController.cs | 40 ++-- .../Controllers/HomeController.cs | 0 .../Controllers/ManageController.cs | 29 ++- .../Data/ApplicationDbContext.cs | 0 ...000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../ExternalLoginConfirmationViewModel.cs | 0 .../ForgotPasswordViewModel.cs | 0 .../AccountViewModels/LoginViewModel.cs | 0 .../AccountViewModels/RegisterViewModel.cs | 0 .../ResetPasswordViewModel.cs | 0 .../AccountViewModels/SendCodeViewModel.cs | 0 .../AccountViewModels/VerifyCodeViewModel.cs | 0 .../WebDotnetCore/Models/ApplicationUser.cs | 0 .../AddPhoneNumberViewModel.cs | 0 .../ChangePasswordViewModel.cs | 0 .../ConfigureTwoFactorViewModel.cs | 0 .../ManageViewModels/FactorViewModel.cs | 0 .../Models/ManageViewModels/IndexViewModel.cs | 0 .../ManageViewModels/ManageLoginsViewModel.cs | 0 .../ManageViewModels/RemoveLoginViewModel.cs | 0 .../ManageViewModels/SetPasswordViewModel.cs | 0 .../VerifyPhoneNumberViewModel.cs | 0 .../{src => }/WebDotnetCore/Program.cs | 1 + .../Properties/launchSettings.json | 10 +- .../WebDotnetCore/Services/IEmailSender.cs | 0 .../WebDotnetCore/Services/ISmsSender.cs | 0 .../WebDotnetCore/Services/MessageServices.cs | 2 +- .../{src => }/WebDotnetCore/Startup.cs | 8 +- .../Views/Account/AccessDenied.cshtml | 8 + .../Views/Account/ConfirmEmail.cshtml | 0 .../Account/ExternalLoginConfirmation.cshtml | 0 .../Views/Account/ExternalLoginFailure.cshtml | 0 .../Views/Account/ForgotPassword.cshtml | 2 +- .../Account/ForgotPasswordConfirmation.cshtml | 0 .../Views/Account/Lockout.cshtml | 0 .../WebDotnetCore}/Views/Account/Login.cshtml | 2 +- .../Views/Account/Register.cshtml | 0 .../Views/Account/ResetPassword.cshtml | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../Views/Account/SendCode.cshtml | 0 .../Views/Account/VerifyCode.cshtml | 2 +- .../WebDotnetCore/Views/Home/About.cshtml | 0 .../WebDotnetCore/Views/Home/Contact.cshtml | 0 .../WebDotnetCore/Views/Home/Index.cshtml | 45 +++-- .../Views/Manage/AddPhoneNumber.cshtml | 0 .../Views/Manage/ChangePassword.cshtml | 0 .../WebDotnetCore}/Views/Manage/Index.cshtml | 6 +- .../Views/Manage/ManageLogins.cshtml | 0 .../Views/Manage/SetPassword.cshtml | 0 .../Views/Manage/VerifyPhoneNumber.cshtml | 0 .../WebDotnetCore/Views/Shared/Error.cshtml | 0 .../WebDotnetCore/Views/Shared/_Layout.cshtml | 24 ++- .../Views/Shared/_LoginPartial.cshtml | 4 +- .../Shared/_ValidationScriptsPartial.cshtml | 8 +- .../WebDotnetCore/Views/_ViewImports.cshtml | 0 .../WebDotnetCore/Views/_ViewStart.cshtml | 0 .../WebDotnetCore/WebDotnetCore.csproj | 37 ++++ .../appsettings.Development.json | 10 + .../{src => }/WebDotnetCore/appsettings.json | 6 +- .../{src => }/WebDotnetCore/bower.json | 2 +- .../{src => }/WebDotnetCore/bundleconfig.json | 2 +- .../WebDotnetCore/wwwroot/css/site.css | 16 +- .../WebDotnetCore/wwwroot/css/site.min.css | 0 .../WebDotnetCore/wwwroot/favicon.ico | Bin .../WebDotnetCore/wwwroot/images/banner1.svg | 0 .../WebDotnetCore/wwwroot/images/banner2.svg | 0 .../WebDotnetCore/wwwroot/images/banner3.svg | 0 .../WebDotnetCore/wwwroot/images/banner4.svg | 0 .../WebDotnetCore/wwwroot/js/site.js | 0 .../WebDotnetCore/wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 17 +- .../wwwroot/lib/bootstrap/LICENSE | 2 +- .../bootstrap/dist/css/bootstrap-theme.css | 4 +- .../dist/css/bootstrap-theme.css.map | 2 +- .../dist/css/bootstrap-theme.min.css | 4 +- .../dist/css/bootstrap-theme.min.css.map | 1 + .../lib/bootstrap/dist/css/bootstrap.css | 7 +- .../lib/bootstrap/dist/css/bootstrap.css.map | 1 + .../lib/bootstrap/dist/css/bootstrap.min.css | 6 + .../bootstrap/dist/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 114 ++++++----- .../lib/bootstrap/dist/js/bootstrap.min.js | 7 + .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 DeploymentWeb/WebDotnetCore/global.json | 6 - .../src/WebDotnetCore/Project_Readme.html | 187 ------------------ .../src/WebDotnetCore/WebDotnetCore.xproj | 23 --- .../src/WebDotnetCore/project.json | 96 --------- .../src/WebDotnetCore/web.config | 14 -- .../src/WebDotnetCore/wwwroot/_references.js | 6 - .../dist/css/bootstrap-theme.min.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.min.css | 6 - .../bootstrap/dist/css/bootstrap.min.css.map | 1 - .../lib/bootstrap/dist/js/bootstrap.min.js | 7 - .../WebDotnetFramework/WebDotnetFramework.sln | 24 +-- .../{src => }/WebDotnetFramework/.bowerrc | 0 .../Controllers/AccountController.cs | 40 ++-- .../Controllers/HomeController.cs | 0 .../Controllers/ManageController.cs | 44 ++++- .../Data/ApplicationDbContext.cs | 0 ...000000000_CreateIdentitySchema.Designer.cs | 13 +- .../00000000000000_CreateIdentitySchema.cs | 15 +- .../ApplicationDbContextModelSnapshot.cs | 13 +- .../ExternalLoginConfirmationViewModel.cs | 0 .../ForgotPasswordViewModel.cs | 0 .../AccountViewModels/LoginViewModel.cs | 0 .../AccountViewModels/RegisterViewModel.cs | 0 .../ResetPasswordViewModel.cs | 0 .../AccountViewModels/SendCodeViewModel.cs | 0 .../AccountViewModels/VerifyCodeViewModel.cs | 0 .../Models/ApplicationUser.cs | 0 .../AddPhoneNumberViewModel.cs | 0 .../ChangePasswordViewModel.cs | 0 .../ConfigureTwoFactorViewModel.cs | 0 .../ManageViewModels/FactorViewModel.cs | 0 .../Models/ManageViewModels/IndexViewModel.cs | 0 .../ManageViewModels/ManageLoginsViewModel.cs | 0 .../ManageViewModels/RemoveLoginViewModel.cs | 0 .../ManageViewModels/SetPasswordViewModel.cs | 0 .../VerifyPhoneNumberViewModel.cs | 0 .../{src => }/WebDotnetFramework/Program.cs | 1 + .../Properties/launchSettings.json | 10 +- .../Services/IEmailSender.cs | 0 .../WebDotnetFramework/Services/ISmsSender.cs | 0 .../Services/MessageServices.cs | 2 +- .../{src => }/WebDotnetFramework/Startup.cs | 17 +- .../Views/Account/AccessDenied.cshtml | 8 + .../Views/Account/ConfirmEmail.cshtml | 0 .../Account/ExternalLoginConfirmation.cshtml | 0 .../Views/Account/ExternalLoginFailure.cshtml | 0 .../Views/Account/ForgotPassword.cshtml | 2 +- .../Account/ForgotPasswordConfirmation.cshtml | 0 .../Views/Account/Lockout.cshtml | 0 .../Views/Account/Login.cshtml | 2 +- .../Views/Account/Register.cshtml | 0 .../Views/Account/ResetPassword.cshtml | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../Views/Account/SendCode.cshtml | 0 .../Views/Account/VerifyCode.cshtml | 2 +- .../Views/Home/About.cshtml | 0 .../Views/Home/Contact.cshtml | 0 .../Views/Home/Index.cshtml | 45 +++-- .../Views/Manage/AddPhoneNumber.cshtml | 0 .../Views/Manage/ChangePassword.cshtml | 0 .../Views/Manage/Index.cshtml | 6 +- .../Views/Manage/ManageLogins.cshtml | 0 .../Views/Manage/SetPassword.cshtml | 0 .../Views/Manage/VerifyPhoneNumber.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 33 ++-- .../Views/Shared/_LoginPartial.cshtml | 10 +- .../Shared/_ValidationScriptsPartial.cshtml | 8 +- .../Views/_ViewImports.cshtml | 1 - .../Views/_ViewStart.cshtml | 0 .../WebDotnetFramework.csproj | 34 ++++ .../{src => }/WebDotnetFramework/app.config | 0 .../appsettings.Development.json | 10 + .../WebDotnetFramework/appsettings.json | 9 +- .../{src => }/WebDotnetFramework/bower.json | 2 +- .../WebDotnetFramework/bundleconfig.json | 24 +++ .../WebDotnetFramework/wwwroot/css/site.css | 18 +- .../wwwroot/css/site.min.css | 1 + .../WebDotnetFramework/wwwroot/favicon.ico | Bin .../wwwroot/images/banner1.svg | 0 .../wwwroot/images/banner2.svg | 0 .../wwwroot/images/banner3.svg | 0 .../wwwroot/images/banner4.svg | 0 .../WebDotnetFramework/wwwroot/js/site.js | 0 .../WebDotnetFramework/wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 17 +- .../wwwroot/lib/bootstrap/LICENSE | 2 +- .../bootstrap/dist/css/bootstrap-theme.css | 4 +- .../dist/css/bootstrap-theme.css.map | 2 +- .../dist/css/bootstrap-theme.min.css | 4 +- .../dist/css/bootstrap-theme.min.css.map | 1 + .../lib/bootstrap/dist/css/bootstrap.css | 7 +- .../lib/bootstrap/dist/css/bootstrap.css.map | 1 + .../lib/bootstrap/dist/css/bootstrap.min.css | 6 + .../bootstrap/dist/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 114 ++++++----- .../lib/bootstrap/dist/js/bootstrap.min.js | 7 + .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 DeploymentWeb/WebDotnetFramework/global.json | 6 - .../WebDotnetFramework/Project_Readme.html | 187 ------------------ .../WebDotnetFramework.xproj | 25 --- .../src/WebDotnetFramework/gulpfile.js | 45 ----- .../src/WebDotnetFramework/package.json | 12 -- .../src/WebDotnetFramework/project.json | 91 --------- .../src/WebDotnetFramework/web.config | 14 -- .../WebDotnetFramework/wwwroot/_references.js | 7 - .../wwwroot/css/site.min.css | 1 - .../dist/css/bootstrap-theme.min.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.min.css | 6 - .../bootstrap/dist/css/bootstrap.min.css.map | 1 - .../lib/bootstrap/dist/js/bootstrap.min.js | 7 - 238 files changed, 626 insertions(+), 1140 deletions(-) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/.bowerrc (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Controllers/AccountController.cs (91%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Controllers/HomeController.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Controllers/ManageController.cs (92%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Data/ApplicationDbContext.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/ForgotPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/LoginViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/RegisterViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/ResetPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/SendCodeViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/AccountViewModels/VerifyCodeViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ApplicationUser.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/AddPhoneNumberViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/ChangePasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/FactorViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/IndexViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/ManageLoginsViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/RemoveLoginViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/SetPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Program.cs (92%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Properties/launchSettings.json (81%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Services/IEmailSender.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Services/ISmsSender.cs (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Services/MessageServices.cs (89%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Startup.cs (91%) create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/AccessDenied.cshtml rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ConfirmEmail.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ExternalLoginConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ExternalLoginFailure.cshtml (100%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/Views/Account/ForgotPassword.cshtml (92%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ForgotPasswordConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/Lockout.cshtml (100%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/Views/Account/Login.cshtml (97%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/Register.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ResetPassword.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/ResetPasswordConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Account/SendCode.cshtml (100%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/Views/Account/VerifyCode.cshtml (94%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Home/About.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Home/Contact.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Home/Index.cshtml (53%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Manage/AddPhoneNumber.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Manage/ChangePassword.cshtml (100%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/Views/Manage/Index.cshtml (89%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Manage/ManageLogins.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Manage/SetPassword.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Manage/VerifyPhoneNumber.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Shared/Error.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Shared/_Layout.cshtml (78%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Shared/_LoginPartial.cshtml (83%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/Shared/_ValidationScriptsPartial.cshtml (72%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/_ViewImports.cshtml (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/Views/_ViewStart.cshtml (100%) create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/WebDotnetCore.csproj create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/appsettings.Development.json rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/appsettings.json (59%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/bower.json (86%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/bundleconfig.json (93%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/css/site.css (82%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/css/site.min.css (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/favicon.ico (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/images/banner1.svg (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/images/banner2.svg (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/images/banner3.svg (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/images/banner4.svg (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/js/site.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/js/site.min.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/.bower.json (70%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/wwwroot/lib/bootstrap/LICENSE (96%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (99%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (99%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css (99%) create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css (99%) create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename DeploymentWeb/{WebDotnetFramework/src/WebDotnetFramework => WebDotnetCore/WebDotnetCore}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (96%) create mode 100644 DeploymentWeb/WebDotnetCore/WebDotnetCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/.bower.json (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery/.bower.json (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery/LICENSE.txt (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery/dist/jquery.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename DeploymentWeb/WebDotnetCore/{src => }/WebDotnetCore/wwwroot/lib/jquery/dist/jquery.min.map (100%) delete mode 100644 DeploymentWeb/WebDotnetCore/global.json delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Project_Readme.html delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/WebDotnetCore.xproj delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/project.json delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/web.config delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/_references.js delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map delete mode 100644 DeploymentWeb/WebDotnetCore/src/WebDotnetCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/.bowerrc (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Controllers/AccountController.cs (91%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Controllers/HomeController.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Controllers/ManageController.cs (89%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Data/ApplicationDbContext.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (95%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Data/Migrations/00000000000000_CreateIdentitySchema.cs (93%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Data/Migrations/ApplicationDbContextModelSnapshot.cs (95%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/ForgotPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/LoginViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/RegisterViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/ResetPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/SendCodeViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/AccountViewModels/VerifyCodeViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ApplicationUser.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/AddPhoneNumberViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/ChangePasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/FactorViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/IndexViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/ManageLoginsViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/RemoveLoginViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/SetPasswordViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Program.cs (92%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Properties/launchSettings.json (81%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Services/IEmailSender.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Services/ISmsSender.cs (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Services/MessageServices.cs (89%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Startup.cs (81%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/Views/Account/AccessDenied.cshtml rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ConfirmEmail.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ExternalLoginConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ExternalLoginFailure.cshtml (100%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/Views/Account/ForgotPassword.cshtml (92%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ForgotPasswordConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/Lockout.cshtml (100%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/Views/Account/Login.cshtml (97%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/Register.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ResetPassword.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/ResetPasswordConfirmation.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Account/SendCode.cshtml (100%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/Views/Account/VerifyCode.cshtml (94%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Home/About.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Home/Contact.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Home/Index.cshtml (53%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Manage/AddPhoneNumber.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Manage/ChangePassword.cshtml (100%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/Views/Manage/Index.cshtml (89%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Manage/ManageLogins.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Manage/SetPassword.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Manage/VerifyPhoneNumber.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Shared/Error.cshtml (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Shared/_Layout.cshtml (67%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Shared/_LoginPartial.cshtml (51%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/Shared/_ValidationScriptsPartial.cshtml (72%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/_ViewImports.cshtml (72%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/Views/_ViewStart.cshtml (100%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/WebDotnetFramework.csproj rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/app.config (100%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/appsettings.Development.json rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/appsettings.json (51%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/bower.json (86%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/bundleconfig.json rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/css/site.css (72%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/css/site.min.css rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/favicon.ico (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/images/banner1.svg (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/images/banner2.svg (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/images/banner3.svg (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/images/banner4.svg (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/js/site.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/js/site.min.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/.bower.json (70%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/wwwroot/lib/bootstrap/LICENSE (96%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (99%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (99%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css (99%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css (99%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename DeploymentWeb/{WebDotnetCore/src/WebDotnetCore => WebDotnetFramework/WebDotnetFramework}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (96%) create mode 100644 DeploymentWeb/WebDotnetFramework/WebDotnetFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/.bower.json (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery/.bower.json (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery/LICENSE.txt (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery/dist/jquery.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename DeploymentWeb/WebDotnetFramework/{src => }/WebDotnetFramework/wwwroot/lib/jquery/dist/jquery.min.map (100%) delete mode 100644 DeploymentWeb/WebDotnetFramework/global.json delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Project_Readme.html delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/WebDotnetFramework.xproj delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/gulpfile.js delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/package.json delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/project.json delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/web.config delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/_references.js delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/css/site.min.css delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map delete mode 100644 DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/DeploymentWeb/WebDotnetCore/WebDotnetCore.sln b/DeploymentWeb/WebDotnetCore/WebDotnetCore.sln index 4756363e..e054acdc 100644 --- a/DeploymentWeb/WebDotnetCore/WebDotnetCore.sln +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore.sln @@ -1,16 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A7C8E6A-827E-4A19-83EC-99930B4E8400}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D76CB3C9-AE09-41A5-9F71-C82AB72AE304}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebDotnetCore", "src\WebDotnetCore\WebDotnetCore.xproj", "{E26C4306-0964-4734-9C1A-F3F87CFC43A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDotnetCore", "WebDotnetCore\WebDotnetCore.csproj", "{AD73ECFE-6841-4169-A26F-4BEADF596F2E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,15 +11,12 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E26C4306-0964-4734-9C1A-F3F87CFC43A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E26C4306-0964-4734-9C1A-F3F87CFC43A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E26C4306-0964-4734-9C1A-F3F87CFC43A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E26C4306-0964-4734-9C1A-F3F87CFC43A5}.Release|Any CPU.Build.0 = Release|Any CPU + {AD73ECFE-6841-4169-A26F-4BEADF596F2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD73ECFE-6841-4169-A26F-4BEADF596F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD73ECFE-6841-4169-A26F-4BEADF596F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD73ECFE-6841-4169-A26F-4BEADF596F2E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E26C4306-0964-4734-9C1A-F3F87CFC43A5} = {5A7C8E6A-827E-4A19-83EC-99930B4E8400} - EndGlobalSection EndGlobal diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/.bowerrc b/DeploymentWeb/WebDotnetCore/WebDotnetCore/.bowerrc similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/.bowerrc rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/.bowerrc diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/AccountController.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/AccountController.cs similarity index 91% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/AccountController.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/AccountController.cs index 82590dc1..0bf8b5ee 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/AccountController.cs +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/AccountController.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using WebDotnetCore.Models; using WebDotnetCore.Models.AccountViewModels; using WebDotnetCore.Services; @@ -22,16 +23,19 @@ public class AccountController : Controller private readonly IEmailSender _emailSender; private readonly ISmsSender _smsSender; private readonly ILogger _logger; + private readonly string _externalCookieScheme; public AccountController( UserManager userManager, SignInManager signInManager, + IOptions identityCookieOptions, IEmailSender emailSender, ISmsSender smsSender, ILoggerFactory loggerFactory) { _userManager = userManager; _signInManager = signInManager; + _externalCookieScheme = identityCookieOptions.Value.ExternalCookieAuthenticationScheme; _emailSender = emailSender; _smsSender = smsSender; _logger = loggerFactory.CreateLogger(); @@ -41,8 +45,11 @@ public AccountController( // GET: /Account/Login [HttpGet] [AllowAnonymous] - public IActionResult Login(string returnUrl = null) + public async Task Login(string returnUrl = null) { + // Clear the existing external cookie to ensure a clean login process + await HttpContext.Authentication.SignOutAsync(_externalCookieScheme); + ViewData["ReturnUrl"] = returnUrl; return View(); } @@ -109,10 +116,10 @@ public async Task Register(RegisterViewModel model, string return var result = await _userManager.CreateAsync(user, model.Password); if (result.Succeeded) { - // For more information on how to enable account confirmation and password reset please visit http://go.microsoft.com/fwlink/?LinkID=532713 + // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 // Send an email with this link //var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - //var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); + //var callbackUrl = Url.Action(nameof(ConfirmEmail), "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); //await _emailSender.SendEmailAsync(model.Email, "Confirm your account", // $"Please confirm your account by clicking this link: link"); await _signInManager.SignInAsync(user, isPersistent: false); @@ -127,10 +134,10 @@ public async Task Register(RegisterViewModel model, string return } // - // POST: /Account/LogOff + // POST: /Account/Logout [HttpPost] [ValidateAntiForgeryToken] - public async Task LogOff() + public async Task Logout() { await _signInManager.SignOutAsync(); _logger.LogInformation(4, "User logged out."); @@ -145,7 +152,7 @@ public async Task LogOff() public IActionResult ExternalLogin(string provider, string returnUrl = null) { // Request a redirect to the external login provider. - var redirectUrl = Url.Action("ExternalLoginCallback", "Account", new { ReturnUrl = returnUrl }); + var redirectUrl = Url.Action(nameof(ExternalLoginCallback), "Account", new { ReturnUrl = returnUrl }); var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl); return Challenge(properties, provider); } @@ -262,17 +269,17 @@ public async Task ForgotPassword(ForgotPasswordViewModel model) { if (ModelState.IsValid) { - var user = await _userManager.FindByNameAsync(model.Email); + var user = await _userManager.FindByEmailAsync(model.Email); if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) { // Don't reveal that the user does not exist or is not confirmed return View("ForgotPasswordConfirmation"); } - // For more information on how to enable account confirmation and password reset please visit http://go.microsoft.com/fwlink/?LinkID=532713 + // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 // Send an email with this link //var code = await _userManager.GeneratePasswordResetTokenAsync(user); - //var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); + //var callbackUrl = Url.Action(nameof(ResetPassword), "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); //await _emailSender.SendEmailAsync(model.Email, "Reset Password", // $"Please reset your password by clicking here: link"); //return View("ForgotPasswordConfirmation"); @@ -311,7 +318,7 @@ public async Task ResetPassword(ResetPasswordViewModel model) { return View(model); } - var user = await _userManager.FindByNameAsync(model.Email); + var user = await _userManager.FindByEmailAsync(model.Email); if (user == null) { // Don't reveal that the user does not exist @@ -436,6 +443,14 @@ public async Task VerifyCode(VerifyCodeViewModel model) } } + // + // GET /Account/AccessDenied + [HttpGet] + public IActionResult AccessDenied() + { + return View(); + } + #region Helpers private void AddErrors(IdentityResult result) @@ -446,11 +461,6 @@ private void AddErrors(IdentityResult result) } } - private Task GetCurrentUserAsync() - { - return _userManager.GetUserAsync(HttpContext.User); - } - private IActionResult RedirectToLocal(string returnUrl) { if (Url.IsLocalUrl(returnUrl)) diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/HomeController.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/HomeController.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/HomeController.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/HomeController.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/ManageController.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/ManageController.cs similarity index 92% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/ManageController.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/ManageController.cs index 3df7330b..549686b3 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Controllers/ManageController.cs +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Controllers/ManageController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using WebDotnetCore.Models; using WebDotnetCore.Models.ManageViewModels; using WebDotnetCore.Services; @@ -17,19 +18,22 @@ public class ManageController : Controller { private readonly UserManager _userManager; private readonly SignInManager _signInManager; + private readonly string _externalCookieScheme; private readonly IEmailSender _emailSender; private readonly ISmsSender _smsSender; private readonly ILogger _logger; public ManageController( - UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender, - ISmsSender smsSender, - ILoggerFactory loggerFactory) + UserManager userManager, + SignInManager signInManager, + IOptions identityCookieOptions, + IEmailSender emailSender, + ISmsSender smsSender, + ILoggerFactory loggerFactory) { _userManager = userManager; _signInManager = signInManager; + _externalCookieScheme = identityCookieOptions.Value.ExternalCookieAuthenticationScheme; _emailSender = emailSender; _smsSender = smsSender; _logger = loggerFactory.CreateLogger(); @@ -300,10 +304,13 @@ public async Task ManageLogins(ManageMessageId? message = null) // POST: /Manage/LinkLogin [HttpPost] [ValidateAntiForgeryToken] - public IActionResult LinkLogin(string provider) + public async Task LinkLogin(string provider) { + // Clear the existing external cookie to ensure a clean login process + await HttpContext.Authentication.SignOutAsync(_externalCookieScheme); + // Request a redirect to the external login provider to link a login for the current user - var redirectUrl = Url.Action("LinkLoginCallback", "Manage"); + var redirectUrl = Url.Action(nameof(LinkLoginCallback), "Manage"); var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User)); return Challenge(properties, provider); } @@ -324,7 +331,13 @@ public async Task LinkLoginCallback() return RedirectToAction(nameof(ManageLogins), new { Message = ManageMessageId.Error }); } var result = await _userManager.AddLoginAsync(user, info); - var message = result.Succeeded ? ManageMessageId.AddLoginSuccess : ManageMessageId.Error; + var message = ManageMessageId.Error; + if (result.Succeeded) + { + message = ManageMessageId.AddLoginSuccess; + // Clear the existing external cookie to ensure a clean login process + await HttpContext.Authentication.SignOutAsync(_externalCookieScheme); + } return RedirectToAction(nameof(ManageLogins), new { Message = message }); } diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/ApplicationDbContext.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/ApplicationDbContext.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/ApplicationDbContext.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/ApplicationDbContext.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ForgotPasswordViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/LoginViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/LoginViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/LoginViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/RegisterViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/RegisterViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/RegisterViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ResetPasswordViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/ResetPasswordViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/SendCodeViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/SendCodeViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/VerifyCodeViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/AccountViewModels/VerifyCodeViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ApplicationUser.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ApplicationUser.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ApplicationUser.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ApplicationUser.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ChangePasswordViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ChangePasswordViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/FactorViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/FactorViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/FactorViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/IndexViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/IndexViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/IndexViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ManageLoginsViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/ManageLoginsViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/RemoveLoginViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/RemoveLoginViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/SetPasswordViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/SetPasswordViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Program.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Program.cs similarity index 92% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Program.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Program.cs index b48ad902..96b4a820 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Program.cs +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Program.cs @@ -16,6 +16,7 @@ public static void Main(string[] args) .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() + .UseApplicationInsights() .Build(); host.Run(); diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Properties/launchSettings.json b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Properties/launchSettings.json similarity index 81% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Properties/launchSettings.json rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Properties/launchSettings.json index 33a1aba8..63897dee 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Properties/launchSettings.json +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Properties/launchSettings.json @@ -1,9 +1,9 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:50549/", + "applicationUrl": "http://localhost:10996/", "sslPort": 0 } }, @@ -18,10 +18,10 @@ "WebDotnetCore": { "commandName": "Project", "launchBrowser": true, - "launchUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "applicationUrl": "http://localhost:10997" } } -} \ No newline at end of file +} diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/IEmailSender.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/IEmailSender.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/IEmailSender.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/IEmailSender.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/ISmsSender.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/ISmsSender.cs similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/ISmsSender.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/ISmsSender.cs diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/MessageServices.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/MessageServices.cs similarity index 89% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/MessageServices.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/MessageServices.cs index 71023694..23ae6189 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Services/MessageServices.cs +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Services/MessageServices.cs @@ -7,7 +7,7 @@ namespace WebDotnetCore.Services { // This class is used by the application to send Email and SMS // when you turn on two-factor authentication in ASP.NET Identity. - // For more details see this link http://go.microsoft.com/fwlink/?LinkID=532713 + // For more details see this link https://go.microsoft.com/fwlink/?LinkID=532713 public class AuthMessageSender : IEmailSender, ISmsSender { public Task SendEmailAsync(string email, string subject, string message) diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Startup.cs b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Startup.cs similarity index 91% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Startup.cs rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Startup.cs index e81dc5ca..64df38dc 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Startup.cs +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Startup.cs @@ -21,13 +21,13 @@ public Startup(IHostingEnvironment env) { var builder = new ConfigurationBuilder() .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); if (env.IsDevelopment()) { - // For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709 - builder.AddUserSecrets(); + // For more details on using the user secret store see https://go.microsoft.com/fwlink/?LinkID=532709 + builder.AddUserSecrets(); } builder.AddEnvironmentVariables(); @@ -75,7 +75,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseIdentity(); - // Add external authentication middleware below. To configure them please see http://go.microsoft.com/fwlink/?LinkID=532715 + // Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715 app.UseMvc(routes => { diff --git a/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/AccessDenied.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/AccessDenied.cshtml new file mode 100644 index 00000000..9a6f8d59 --- /dev/null +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/AccessDenied.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Access Denied"; +} + +
+

Access Denied.

+

You do not have access to this resource.

+
diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ConfirmEmail.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ConfirmEmail.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ConfirmEmail.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ExternalLoginConfirmation.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ExternalLoginConfirmation.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ExternalLoginFailure.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ExternalLoginFailure.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ExternalLoginFailure.cshtml diff --git a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/ForgotPassword.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ForgotPassword.cshtml similarity index 92% rename from DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/ForgotPassword.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ForgotPassword.cshtml index ee02538a..4cdc71c2 100644 --- a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/ForgotPassword.cshtml +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ForgotPassword.cshtml @@ -5,7 +5,7 @@

@ViewData["Title"]

- For more information on how to enable reset password please see this article. + For more information on how to enable reset password please see this article.

@*
diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ForgotPasswordConfirmation.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ForgotPasswordConfirmation.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/Lockout.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Lockout.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/Lockout.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Lockout.cshtml diff --git a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/Login.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Login.cshtml similarity index 97% rename from DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/Login.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Login.cshtml index d8038193..995c47c9 100644 --- a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/Login.cshtml +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Login.cshtml @@ -64,7 +64,7 @@ {

- There are no external authentication services configured. See this article + There are no external authentication services configured. See this article for details on setting up this ASP.NET application to support logging in via external services.

diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/Register.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Register.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/Register.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/Register.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ResetPassword.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ResetPassword.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ResetPassword.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ResetPassword.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ResetPasswordConfirmation.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/ResetPasswordConfirmation.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/SendCode.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/SendCode.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Account/SendCode.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/SendCode.cshtml diff --git a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/VerifyCode.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/VerifyCode.cshtml similarity index 94% rename from DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/VerifyCode.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/VerifyCode.cshtml index c067534a..52a4c736 100644 --- a/DeploymentWeb/WebDotnetFramework/src/WebDotnetFramework/Views/Account/VerifyCode.cshtml +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Account/VerifyCode.cshtml @@ -5,7 +5,7 @@

@ViewData["Title"].

- +
diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/About.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/About.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/About.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/About.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/Contact.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/Contact.cshtml similarity index 100% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/Contact.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/Contact.cshtml diff --git a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/Index.cshtml b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/Index.cshtml similarity index 53% rename from DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/Index.cshtml rename to DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/Index.cshtml index 3cd243dd..e3f313df 100644 --- a/DeploymentWeb/WebDotnetCore/src/WebDotnetCore/Views/Home/Index.cshtml +++ b/DeploymentWeb/WebDotnetCore/WebDotnetCore/Views/Home/Index.cshtml @@ -15,7 +15,7 @@