Skip to content

Commit

Permalink
Updating to 2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cwensley committed Feb 15, 2018
1 parent 3cc6332 commit a91fb0d
Show file tree
Hide file tree
Showing 22 changed files with 52 additions and 52 deletions.
4 changes: 2 additions & 2 deletions src/Addins/Eto.Addin.MonoDevelop/Eto.Addin.MonoDevelop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
</ItemGroup>
<ItemGroup>
<AddinFile Include="Templates\Files\**\*" />
<AddinFile Include="..\..\..\artifacts\nuget\MD$(Configuration)\Eto.Forms.Templates.2.4.0-alpha.nupkg">
<Link>Packages\Eto.Forms.Templates.2.4.0-alpha.nupkg</Link>
<AddinFile Include="..\..\..\artifacts\nuget\MD$(Configuration)\Eto.Forms.Templates.2.4.0.nupkg">
<Link>Packages\Eto.Forms.Templates.2.4.0.nupkg</Link>
</AddinFile>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
<Extension path="/MonoDevelop/Ide/Templates">
<Template
id="Eto.App.CSharp"
path="Packages/Eto.Forms.Templates.2.4.0-alpha.nupkg"
path="Packages/Eto.Forms.Templates.2.4.0.nupkg"
imageId="eto-project"
wizard="Eto.Addin.MonoDevelop.ProjectWizard"
category="multiplat/app/eto"
supportedParameters="AppName,Separated,Xeto,Preview,Jeto,XamMac,NoDash"
/>
<Template
id="Eto.App.FSharp"
path="Packages/Eto.Forms.Templates.2.4.0-alpha.nupkg"
path="Packages/Eto.Forms.Templates.2.4.0.nupkg"
imageId="eto-project"
wizard="Eto.Addin.MonoDevelop.ProjectWizard"
category="multiplat/app/eto"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
<Content Include="template.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\..\..\artifacts\nuget\$(Configuration)\Eto.Forms.Templates.2.4.0-alpha.nupkg">
<Link>Eto.Forms.Templates.2.4.0-alpha.nupkg</Link>
<Content Include="..\..\..\artifacts\nuget\$(Configuration)\Eto.Forms.Templates.2.4.0.nupkg">
<Link>Eto.Forms.Templates.2.4.0.nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Resource Include="Templates\File-FSharp\File.ico" />
Expand Down
2 changes: 1 addition & 1 deletion src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<PackageType>Template</PackageType>
<PackageId>Eto.Forms.Templates</PackageId>
<PackageVersion>2.4.0-alpha</PackageVersion>
<PackageVersion>2.4.0</PackageVersion>
<Authors>Curtis Wensley</Authors>
<Description>Project and File templates for Eto.Forms</Description>
<Tags>cross-platform;gui;ui-framework;desktop;winforms;wpf;mac;osx;gtk;eto;eto.forms;dotnet-new</Tags>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0-alpha" Condition="$(IncludeWinForms) == 'True'" />
<PackageReference Include="Eto.Platform.Wpf" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0" Condition="$(IncludeWinForms) == 'True'" />
<PackageReference Include="Eto.Platform.Wpf" Version="2.4.0" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.4.0" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Eto.Platform.Gtk" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Eto.Platform.Wpf">
<Version>2.4.0-alpha</Version>
<Version>2.4.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Eto.Platform.XamMac2">
<Version>2.4.0-alpha</Version>
<Version>2.4.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Eto.Forms" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Serialization.Json" Version="2.4.0-alpha" Condition="$(UseJeto) == 'True'" />
<PackageReference Include="Eto.Serialization.Xaml" Version="2.4.0-alpha" Condition="$(UseXeto) == 'True'" />
<PackageReference Include="Eto.Forms" Version="2.4.0" />
<PackageReference Include="Eto.Serialization.Json" Version="2.4.0" Condition="$(UseJeto) == 'True'" />
<PackageReference Include="Eto.Serialization.Xaml" Version="2.4.0" Condition="$(UseXeto) == 'True'" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
<HintPath>..\packages\CairoSharp.3.22.24.29\lib\netstandard2.0\CairoSharp.dll</HintPath>
</Reference>
<Reference Include="Eto">
<HintPath>..\packages\Eto.Forms.2.4.0-alpha\lib\netstandard1.0\Eto.dll</HintPath>
<HintPath>..\packages\Eto.Forms.2.4.0\lib\netstandard1.0\Eto.dll</HintPath>
</Reference>
<Reference Include="Eto.Gtk">
<HintPath>..\packages\Eto.Platform.Gtk.2.4.0-alpha\lib\netstandard2.0\Eto.Gtk.dll</HintPath>
<HintPath>..\packages\Eto.Platform.Gtk.2.4.0\lib\netstandard2.0\Eto.Gtk.dll</HintPath>
</Reference>
<Reference Include="Eto.Mac64">
<HintPath>..\packages\Eto.Platform.Mac64.2.4.0-alpha\lib\net45\Eto.Mac64.dll</HintPath>
<HintPath>..\packages\Eto.Platform.Mac64.2.4.0\lib\net45\Eto.Mac64.dll</HintPath>
</Reference>
<Reference Include="Eto.Wpf">
<HintPath>..\packages\Eto.Platform.Wpf.2.4.0-alpha\lib\net45\Eto.Wpf.dll</HintPath>
<HintPath>..\packages\Eto.Platform.Wpf.2.4.0\lib\net45\Eto.Wpf.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.3.2\lib\net45\FSharp.Core.dll</HintPath>
Expand All @@ -96,7 +96,7 @@
<HintPath>..\packages\GtkSharp.3.22.24.29\lib\netstandard2.0\GtkSharp.dll</HintPath>
</Reference>
<Reference Include="MonoMac">
<HintPath>..\packages\Eto.Platform.Mac64.2.4.0-alpha\lib\net45\MonoMac.dll</HintPath>
<HintPath>..\packages\Eto.Platform.Mac64.2.4.0\lib\net45\MonoMac.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="PangoSharp">
Expand All @@ -116,15 +116,15 @@
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets')" />
<Import Project="..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets'))" />
<Error Condition="!Exists('..\packages\Eto.Platform.Mac64.2.4.0-alpha\build\Eto.Platform.Mac64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Platform.Mac64.2.4.0-alpha\build\Eto.Platform.Mac64.targets'))" />
<Error Condition="!Exists('..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets'))" />
<Error Condition="!Exists('..\packages\Eto.Platform.Mac64.2.4.0\build\Eto.Platform.Mac64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Platform.Mac64.2.4.0\build\Eto.Platform.Mac64.targets'))" />
</Target>
<Import Project="..\packages\Eto.Platform.Mac64.2.4.0-alpha\build\Eto.Platform.Mac64.targets" Condition="Exists('..\packages\Eto.Platform.Mac64.2.4.0-alpha\build\Eto.Platform.Mac64.targets')" />
<Import Project="..\packages\Eto.Platform.Mac64.2.4.0\build\Eto.Platform.Mac64.targets" Condition="Exists('..\packages\Eto.Platform.Mac64.2.4.0\build\Eto.Platform.Mac64.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<packages>
<package id="AtkSharp" version="3.22.24.29" targetFramework="net461" />
<package id="CairoSharp" version="3.22.24.29" targetFramework="net461" />
<package id="Eto.Forms" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Platform.Gtk" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Platform.Mac64" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Platform.Wpf" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Forms" version="2.4.0" targetFramework="net461" />
<package id="Eto.Platform.Gtk" version="2.4.0" targetFramework="net461" />
<package id="Eto.Platform.Mac64" version="2.4.0" targetFramework="net461" />
<package id="Eto.Platform.Wpf" version="2.4.0" targetFramework="net461" />
<package id="FSharp.Core" version="4.3.2" targetFramework="net461" />
<package id="GdkSharp" version="3.22.24.29" targetFramework="net461" />
<package id="GioSharp" version="3.22.24.29" targetFramework="net461" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
<HintPath>..\packages\CairoSharp.3.22.24.29\lib\netstandard2.0\CairoSharp.dll</HintPath>
</Reference>
<Reference Include="Eto">
<HintPath>..\packages\Eto.Forms.2.4.0-alpha\lib\netstandard1.0\Eto.dll</HintPath>
<HintPath>..\packages\Eto.Forms.2.4.0\lib\netstandard1.0\Eto.dll</HintPath>
</Reference>
<Reference Include="Eto.Gtk">
<HintPath>..\packages\Eto.Platform.Gtk.2.4.0-alpha\lib\netstandard2.0\Eto.Gtk.dll</HintPath>
<HintPath>..\packages\Eto.Platform.Gtk.2.4.0\lib\netstandard2.0\Eto.Gtk.dll</HintPath>
</Reference>
<Reference Include="GdkSharp">
<HintPath>..\packages\GdkSharp.3.22.24.29\lib\netstandard2.0\GdkSharp.dll</HintPath>
Expand Down Expand Up @@ -107,12 +107,12 @@
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets')" />
<Import Project="..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets'))" />
<Error Condition="!Exists('..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<packages>
<package id="AtkSharp" version="3.22.24.29" targetFramework="net461" />
<package id="CairoSharp" version="3.22.24.29" targetFramework="net461" />
<package id="Eto.Forms" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Platform.Gtk" version="2.4.0-alpha" targetFramework="net461" />
<package id="Eto.Forms" version="2.4.0" targetFramework="net461" />
<package id="Eto.Platform.Gtk" version="2.4.0" targetFramework="net461" />
<package id="GdkSharp" version="3.22.24.29" targetFramework="net461" />
<package id="GioSharp" version="3.22.24.29" targetFramework="net461" />
<package id="GLibSharp" version="3.22.24.29" targetFramework="net461" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.3.2" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.4.0" />
</ItemGroup>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.3.2" />
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Windows" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.3.2" />
<PackageReference Include="Eto.Platform.Wpf" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Platform.Wpf" Version="2.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
<Reference Include="FSharp.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="Eto">
<HintPath>..\packages\Eto.Forms.2.4.0-alpha\lib\netstandard1.0\Eto.dll</HintPath>
<HintPath>..\packages\Eto.Forms.2.4.0\lib\netstandard1.0\Eto.dll</HintPath>
</Reference>
<Reference Include="Eto.XamMac2">
<HintPath>..\packages\Eto.Platform.XamMac2.2.4.0-alpha\lib\net45\Eto.XamMac2.dll</HintPath>
<HintPath>..\packages\Eto.Platform.XamMac2.2.4.0\lib\net45\Eto.XamMac2.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -91,6 +91,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" />
<Import Project="..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0-alpha\build\Eto.Forms.targets')" />
<Import Project="..\packages\Eto.Platform.XamMac2.2.4.0-alpha\build\Eto.Platform.XamMac2.targets" Condition="Exists('..\packages\Eto.Platform.XamMac2.2.4.0-alpha\build\Eto.Platform.XamMac2.targets')" />
<Import Project="..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0\build\Eto.Forms.targets')" />
<Import Project="..\packages\Eto.Platform.XamMac2.2.4.0\build\Eto.Platform.XamMac2.targets" Condition="Exists('..\packages\Eto.Platform.XamMac2.2.4.0\build\Eto.Platform.XamMac2.targets')" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Eto.Forms" version="2.4.0-alpha" targetFramework="net45" />
<package id="Eto.Platform.XamMac2" version="2.4.0-alpha" targetFramework="net45" />
<package id="Eto.Forms" version="2.4.0" targetFramework="net45" />
<package id="Eto.Platform.XamMac2" version="2.4.0" targetFramework="net45" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<ItemGroup>
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.3.2" />
<PackageReference Include="Eto.Forms" Version="2.4.0-alpha" />
<PackageReference Include="Eto.Serialization.Json" Version="2.4.0-alpha" Condition="$(UseJeto) == 'True'" />
<PackageReference Include="Eto.Serialization.Xaml" Version="2.4.0-alpha" Condition="$(UseXeto) == 'True'" />
<PackageReference Include="Eto.Forms" Version="2.4.0" />
<PackageReference Include="Eto.Serialization.Json" Version="2.4.0" Condition="$(UseJeto) == 'True'" />
<PackageReference Include="Eto.Serialization.Xaml" Version="2.4.0" Condition="$(UseXeto) == 'True'" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Shared/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("2.3.*")]
[assembly: AssemblyInformationalVersion("2.4.0-alpha")]
[assembly: AssemblyVersion("2.4.0.0")]
[assembly: AssemblyInformationalVersion("2.4.0")]

0 comments on commit a91fb0d

Please sign in to comment.