Skip to content

Commit

Permalink
Upgrade to v5-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
mbdavid committed Oct 30, 2019
1 parent 5587238 commit 4cf8b29
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 26 deletions.
Binary file modified LiteDB.Studio.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions LiteDB.Studio/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
</configuration>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ http://minisqlquery.codeplex.com/license
<Key word="CONCAT" />
<Key word="RAW_ID" />
<Key word="KEYS" />
<Key word="REMOVE_KEYS" />
<Key word="OID_CREATIONTIME" />
<Key word="IIF" />
<Key word="COALESCE" />
Expand Down
12 changes: 7 additions & 5 deletions LiteDB.Studio/LiteDB.Studio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LiteDB.Studio</RootNamespace>
<AssemblyName>LiteDB.Studio</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -39,7 +39,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="LiteDB, Version=5.0.0.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
<HintPath>..\packages\LiteDB.5.0.0-alpha2\lib\net45\LiteDB.dll</HintPath>
<HintPath>..\packages\LiteDB.5.0.0-beta\lib\net45\LiteDB.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -337,6 +337,9 @@
<ItemGroup>
<Content Include="LiteDB.Studio.ico" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<UsingTask TaskName="ILMerge.MSBuild.Tasks.ILMerge" AssemblyFile="$(SolutionDir)\packages\ILMerge.MSBuild.Tasks.1.0.0.3\tools\ILMerge.MSBuild.Tasks.dll" />
<Target Name="AfterBuild">
Expand All @@ -349,6 +352,5 @@
</PropertyGroup>
<Message Text="ILMerge @(MergeAsm) -&gt; $(MergedAssembly)" Importance="high" />
<ILMerge InputAssemblies="@(MergeAsm)" OutputFile="$(MergedAssembly)" TargetKind="SameAsPrimaryAssembly" />
</Target>

</Target>
</Project>
4 changes: 2 additions & 2 deletions LiteDB.Studio/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("0002e0ff-c91f-4b8b-b29b-2a477e184408")]
[assembly: AssemblyVersion("0.5.1.0")]
[assembly: AssemblyFileVersion("0.5.1.0")]
[assembly: AssemblyVersion("0.5.2.0")]
[assembly: AssemblyFileVersion("0.5.2.0")]
2 changes: 1 addition & 1 deletion LiteDB.Studio/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions LiteDB.Studio/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LiteDB.Studio/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="ILMerge" version="2.13.0307" targetFramework="net461" />
<package id="ILMerge.MSBuild.Tasks" version="1.0.0.3" targetFramework="net461" />
<package id="LiteDB" version="5.0.0-alpha2" targetFramework="net461" />
<package id="LiteDB" version="5.0.0-beta" targetFramework="net461" />
</packages>

0 comments on commit 4cf8b29

Please sign in to comment.