From 112c6f000f064b301c86157605bca2f71be1c15b Mon Sep 17 00:00:00 2001 From: Maddo Date: Mon, 17 Apr 2017 14:33:00 +0200 Subject: [PATCH] Replaced library project with actual dlls --- Catalog.sln | 16 ++-------------- WPFCatalog/MainWindowViewModel.cs | 2 +- WPFCatalog/WPFCatalog.csproj | 12 ++++++++---- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Catalog.sln b/Catalog.sln index 0833825..8bf525d 100644 --- a/Catalog.sln +++ b/Catalog.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImageCatalog 2", "imagecatalog\ImageCatalog 2.vbproj", "{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}" EndProject @@ -13,7 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFCatalog", "WPFCatalog\WP EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CatalogVbLib", "CatalogVbLib\CatalogVbLib.vbproj", "{44465926-240D-473F-90B8-786BA4384406}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoLibrary.WPF.NET46", "MaddoLibrary\MaddoLibrary.WPF.NET46\MaddoLibrary.WPF.NET46.csproj", "{73DA19D7-196D-4B16-B610-93250978A607}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{A3D50937-74F6-4DC8-8D89-B534B484C0F9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,18 +77,6 @@ Global {44465926-240D-473F-90B8-786BA4384406}.Release|x64.ActiveCfg = Release|x64 {44465926-240D-473F-90B8-786BA4384406}.Release|x64.Build.0 = Release|x64 {44465926-240D-473F-90B8-786BA4384406}.Release|x86.ActiveCfg = Release|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|x64.ActiveCfg = Debug|x64 - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|x64.Build.0 = Debug|x64 - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|x86.ActiveCfg = Debug|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Debug|x86.Build.0 = Debug|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Release|Any CPU.Build.0 = Release|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Release|x64.ActiveCfg = Release|x64 - {73DA19D7-196D-4B16-B610-93250978A607}.Release|x64.Build.0 = Release|x64 - {73DA19D7-196D-4B16-B610-93250978A607}.Release|x86.ActiveCfg = Release|Any CPU - {73DA19D7-196D-4B16-B610-93250978A607}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WPFCatalog/MainWindowViewModel.cs b/WPFCatalog/MainWindowViewModel.cs index b383343..73cef20 100644 --- a/WPFCatalog/MainWindowViewModel.cs +++ b/WPFCatalog/MainWindowViewModel.cs @@ -142,7 +142,7 @@ namespace WPFCatalog if (Directory.Exists(Path.GetDirectoryName(savePath))) { Debug.WriteLine(savePath); - FileHelper.WriteToFile(savePath, s); + FileHelper.WriteToFile(savePath, s, false); Debug.WriteLine(s); } diff --git a/WPFCatalog/WPFCatalog.csproj b/WPFCatalog/WPFCatalog.csproj index 9a8e7b6..a5d3f75 100644 --- a/WPFCatalog/WPFCatalog.csproj +++ b/WPFCatalog/WPFCatalog.csproj @@ -66,6 +66,14 @@ ..\packages\MvvmLightLibs.4.1.27.1\lib\net45\GalaSoft.MvvmLight.WPF45.dll + + False + ..\lib\MaddoLibrary.Base.NET45.dll + + + False + ..\lib\MaddoLibrary.WPF.NET46.dll + ..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll @@ -291,10 +299,6 @@ {d27accf2-80fc-4de8-aeb8-351ff076e6d5} CatalogLib - - {73da19d7-196d-4b16-b610-93250978a607} - MaddoLibrary.WPF.NET46 -