Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .Net 5 #49

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update to .Net 5 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d3406bc
Update project to .Net 5
jpk6789 Jun 26, 2021
78f7191
Remove the assets due to includes via NuGet packages
jpk6789 Jun 26, 2021
4f3482a
Updated dependencies of nuget file and update AssemblyInfo
jpk6789 Jun 26, 2021
4b1326f
Fix a missing include
jpk6789 Jun 26, 2021
7fd4985
Add functionality to output to multiple target platforms (net45 and n…
jpk6789 Jun 26, 2021
16906cc
Make the dir of the locale configurable
jpk6789 Jun 27, 2021
48bd28a
Fix previous commit
jpk6789 Jun 27, 2021
28f2a53
And another fix. Accidentally turned parameters around
jpk6789 Jun 27, 2021
b704e0c
Fix number parameters in the Translation class are set to int instead…
jpk6789 Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NGettext.Wpf.Example/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:wpf="clr-namespace:NGettext.Wpf;assembly=NGettext.Wpf"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:enumTranslation="clr-namespace:NGettext.Wpf.EnumTranslation;assembly=NGettext.Wpf"
xmlns:system="clr-namespace:System;assembly=mscorlib"
SizeToContent="Height"
Expand Down
2 changes: 1 addition & 1 deletion NGettext.Wpf.Example/MemoryLeakTestWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:wpf="clr-namespace:NGettext.Wpf;assembly=NGettext.Wpf"
mc:Ignorable="d"
Title="MemoryLeakTestWindow" Height="300" Width="300">
Expand Down
123 changes: 9 additions & 114 deletions NGettext.Wpf.Example/NGettext.Wpf.Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +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">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{33C46AC9-74F3-456B-8FF5-176847C9C2EE}</ProjectGuid>
<TargetFramework>net5.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<RootNamespace>NGettext.Wpf.Example</RootNamespace>
<AssemblyName>NGettext.Wpf.Example</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NGettext, Version=0.6.1.0, Culture=neutral, PublicKeyToken=08d3d1c89dfd2985, processorArchitecture=MSIL">
<HintPath>..\packages\NGettext.0.6.3\lib\net46\NGettext.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="ExampleEnum.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="MemoryLeakTestWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="MemoryLeakTestWindow.xaml.cs">
<DependentUpon>MemoryLeakTestWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Locale\da-DK\LC_MESSAGES\Example.mo">
<None Update="Locale\da-DK\LC_MESSAGES\Example.mo">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Locale\da-DK\LC_MESSAGES\Example.po" />
<None Include="Locale\de-DE\LC_MESSAGES\Example.mo">
<None Update="Locale\de-DE\LC_MESSAGES\Example.mo">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Locale\de-DE\LC_MESSAGES\Example.po" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="UpdateTranslations.ps1" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<ProjectReference Include="..\NGettext.Wpf\NGettext.Wpf.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NGettext.Wpf\NGettext.Wpf.csproj">
<Project>{4BB0EB35-FE32-4295-BF39-4DA1C9B67BB8}</Project>
<Name>NGettext.Wpf</Name>
</ProjectReference>
<PackageReference Include="Gettext.Tools" Version="0.21.0.1" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
6 changes: 0 additions & 6 deletions NGettext.Wpf.Example/packages.config
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions NGettext.Wpf.Tests/Asserts/Assert.cs
View file
Open in desktop

This file was deleted.

98 changes: 0 additions & 98 deletions NGettext.Wpf.Tests/Asserts/BooleanAsserts.cs
View file
Open in desktop

This file was deleted.

Loading