Skip to content

Commit

Permalink
v5.1.0: Updating KGySoft.CoreLibraries reference, using C# 8 features
Browse files Browse the repository at this point in the history
  • Loading branch information
@koszeggy
koszeggy committed Apr 7, 2020
1 parent f4bb137 commit fe12f2e
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 202 deletions.
8 changes: 0 additions & 8 deletions KGySoft.ComponentModelDemo/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,4 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="KGySoft.CoreLibraries" publicKeyToken="b45eba277439ddfe" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.7.0.0" newVersion="4.7.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
179 changes: 15 additions & 164 deletions KGySoft.ComponentModelDemo/KGySoft.ComponentModelDemo.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,172 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{336A85AB-7AD0-4063-9835-24B523D32422}</ProjectGuid>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net472</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>KGySoft.ComponentModelDemo</RootNamespace>
<AssemblyName>KGySoft.ComponentModelDemo</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup>
<StartupObject>KGySoft.ComponentModelDemo.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
<LangVersion>latest</LangVersion>
<Authors>György Kőszeg</Authors>
<OutputType>WinExe</OutputType>
<UseWpf>true</UseWpf>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="KGySoft.CoreLibraries" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="KGySoft.CoreLibraries, Version=5.0.99.2, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\KGySoft.CoreLibraries.5.1.0-alpha.2\lib\net472\KGySoft.CoreLibraries.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Windows.Forms" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CommandBindingCollectionExtensions.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="ViewModel\CommandErrorEventArgs.cs" />
<Compile Include="ViewWinForms\Controls\SafeDataGridView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ViewWpf\Adorners\AdornedElementPlaceholder.cs" />
<Compile Include="ViewWpf\Adorners\ElementAdorner.cs" />
<Compile Include="ViewWpf\Adorners\TemplatedAdorner.cs" />
<Compile Include="ViewModel\MainViewModel.cs" />
<Compile Include="Model\Commands.cs" />
<Compile Include="Model\EditableTestObject.cs" />
<Compile Include="ViewWinForms\Controls\EditMenuStrip.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Model\AllInOneTestObject.cs" />
<Compile Include="Model\ITestObject.cs" />
<Compile Include="Model\ObservableTestObject.cs" />
<Compile Include="Model\PlainTestObject.cs" />
<Compile Include="Model\UndoableTestObject.cs" />
<Compile Include="Model\ValidatingTestObject.cs" />
<Compile Include="ViewWinForms\Forms\MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewWinForms\Forms\MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="ViewWinForms\Images.cs" />
<Compile Include="ViewWinForms\Commands\TooltipUpdater.cs" />
<Compile Include="ViewWinForms\Components\ValidationResultToErrorProviderAdapter.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ViewWinForms\Commands\WinformsCommandBindingsCollection.cs" />
<Compile Include="ViewWpf\App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="ViewWpf\BindingBaseExtensions.cs" />
<Compile Include="ViewWpf\Commands\EventToKGyCommandExtension.cs" />
<Compile Include="ViewWpf\Validation\HasValidationResultExtension.cs" />
<Compile Include="ViewWpf\Windows\MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ViewWpf\Commands\SwitchableWpfCommandBase.cs" />
<Compile Include="ViewWpf\Controls\EditToolBar.xaml.cs">
<DependentUpon>EditToolBar.xaml</DependentUpon>
</Compile>
<Compile Include="ViewWpf\Images.cs" />
<Compile Include="ViewWpf\Commands\KGyCommandAdapter.cs" />
<Compile Include="ViewWpf\Adorners\AdornerBindingExtension.cs" />
<Compile Include="ViewWpf\Commands\ParameterizedWpfCommand.cs" />
<Compile Include="ViewWpf\Commands\SimpleWpfCommand.cs" />
<Compile Include="ViewWpf\UIElementExtensions.cs" />
<Compile Include="ViewWpf\Validation\ValidationBindingExtension.cs" />
<EmbeddedResource Include="ViewWinForms\Forms\MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="..\README.md">
<Link>README.md</Link>
</None>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Page Include="ViewWpf\App.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ViewWpf\Windows\MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ViewWpf\Controls\EditToolBar.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\DataSources\KGySoft.ComponentModelDemo.Model.ITestObject.datasource" />
<None Include="Resources\Undo.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Redo.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Accept.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Cancel.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Edit.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Error.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Information.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Warning.ico" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions KGySoft.ComponentModelDemo/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("5.1.0.0")]
[assembly: AssemblyFileVersion("5.1.0.0")]
16 changes: 8 additions & 8 deletions KGySoft.ComponentModelDemo/ViewWinForms/Images.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ internal static class Images
private static Icon warning;
private static Icon info;

public static Image Undo => undo ?? (undo = Image.FromStream(Properties.Resources.Undo));
public static Image Redo => redo ?? (redo = Image.FromStream(Properties.Resources.Redo));
public static Image Edit => edit ?? (edit = Image.FromStream(Properties.Resources.Edit));
public static Image Accept => accept ?? (accept = Image.FromStream(Properties.Resources.Accept));
public static Image Cancel => cancel ?? (cancel = Image.FromStream(Properties.Resources.Cancel));
public static Image Undo => undo ??= Image.FromStream(Properties.Resources.Undo);
public static Image Redo => redo ??= Image.FromStream(Properties.Resources.Redo);
public static Image Edit => edit ??= Image.FromStream(Properties.Resources.Edit);
public static Image Accept => accept ??= Image.FromStream(Properties.Resources.Accept);
public static Image Cancel => cancel ??= Image.FromStream(Properties.Resources.Cancel);

public static Icon Error => error ?? (error = new Icon(Properties.Resources.Error));
public static Icon Warning => warning ?? (warning = new Icon(Properties.Resources.Warning));
public static Icon Information => info ?? (info = new Icon(Properties.Resources.Information));
public static Icon Error => error ??= new Icon(Properties.Resources.Error);
public static Icon Warning => warning ??= new Icon(Properties.Resources.Warning);
public static Icon Information => info ??= new Icon(Properties.Resources.Information);
}
}
2 changes: 1 addition & 1 deletion KGySoft.ComponentModelDemo/ViewWpf/Commands/EventToKGyCommandExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private ICommandState State
commandState = (ICommandState)owner.State?.Evaluate(source as DependencyObject);
if (commandState != null)
InitEnabledSync();
return commandState ?? (commandState = new CommandState());
return commandState ??= new CommandState();
}
}

Expand Down
18 changes: 9 additions & 9 deletions KGySoft.ComponentModelDemo/ViewWpf/Images.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ internal static class Images

#region Properties

public static ImageSource Undo => undo ?? (undo = BitmapFrame.Create(Properties.Resources.Undo));
public static ImageSource Redo => redo ?? (redo = BitmapFrame.Create(Properties.Resources.Redo));
public static ImageSource Edit => edit ?? (edit = BitmapFrame.Create(Properties.Resources.Edit));
public static ImageSource Accept => accept ?? (accept = BitmapFrame.Create(Properties.Resources.Accept));
public static ImageSource Cancel => cancel ?? (cancel = BitmapFrame.Create(Properties.Resources.Cancel));

public static ImageSource Error => error ?? (error = BitmapFrame.Create(Properties.Resources.Error));
public static ImageSource Warning => warning ?? (warning = BitmapFrame.Create(Properties.Resources.Warning));
public static ImageSource Information => info ?? (info = BitmapFrame.Create(Properties.Resources.Information));
public static ImageSource Undo => undo ??= BitmapFrame.Create(Properties.Resources.Undo);
public static ImageSource Redo => redo ??= BitmapFrame.Create(Properties.Resources.Redo);
public static ImageSource Edit => edit ??= BitmapFrame.Create(Properties.Resources.Edit);
public static ImageSource Accept => accept ??= BitmapFrame.Create(Properties.Resources.Accept);
public static ImageSource Cancel => cancel ??= BitmapFrame.Create(Properties.Resources.Cancel);

public static ImageSource Error => error ??= BitmapFrame.Create(Properties.Resources.Error);
public static ImageSource Warning => warning ??= BitmapFrame.Create(Properties.Resources.Warning);
public static ImageSource Information => info ??= BitmapFrame.Create(Properties.Resources.Information);

#endregion
}
Expand Down
4 changes: 0 additions & 4 deletions KGySoft.ComponentModelDemo/packages.config
View file

This file was deleted.

6 changes: 0 additions & 6 deletions nuget.config
View file

This file was deleted.

0 comments on commit fe12f2e

Please sign in to comment.