Skip to content

Commit 668cd26

Browse files
s-fernandez-vs-fernandez-v
committed
Sample projects updated to 2.2.5
1 parent 4113097 commit 668cd26

File tree

90 files changed

+524
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+524
-1213
lines changed

‎Samples/ApplicationTutorial/C#/Projects/android/ApplicationTutorial-android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@
151151
</ItemGroup>
152152
<ItemGroup>
153153
<PackageReference Include="Noesis.App.Displays.Android">
154-
<Version>2.2.4</Version>
154+
<Version>2.2.5</Version>
155155
</PackageReference>
156156
<PackageReference Include="Noesis.App.RenderContexts.EGL">
157-
<Version>2.2.4</Version>
157+
<Version>2.2.5</Version>
158158
</PackageReference>
159159
</ItemGroup>
160160
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎Samples/ApplicationTutorial/C#/Projects/blend/ApplicationTutorial-blend.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</ItemGroup>
9898
<ItemGroup>
9999
<PackageReference Include="Noesis.GUI.Extensions">
100-
<Version>2.2.2</Version>
100+
<Version>2.2.5</Version>
101101
</PackageReference>
102102
</ItemGroup>
103103
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Samples/ApplicationTutorial/C#/Projects/ios/ApplicationTutorial-ios.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@
107107
</ItemGroup>
108108
<ItemGroup>
109109
<PackageReference Include="Noesis.App.Displays.UIKit">
110-
<Version>2.2.4</Version>
110+
<Version>2.2.5</Version>
111111
</PackageReference>
112112
<PackageReference Include="Noesis.App.RenderContexts.MTL">
113-
<Version>2.2.4</Version>
113+
<Version>2.2.5</Version>
114114
</PackageReference>
115115
</ItemGroup>
116116
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

‎Samples/ApplicationTutorial/C#/Projects/linux/App.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NoesisApp;
2+
using System.Runtime.InteropServices;
23

34
namespace RssReader
45
{
@@ -11,7 +12,15 @@ protected override Display CreateDisplay()
1112

1213
protected override RenderContext CreateRenderContext()
1314
{
14-
return new RenderContextGLX();
15+
if (RuntimeInformation.OSArchitecture == Architecture.Arm ||
16+
RuntimeInformation.OSArchitecture == Architecture.Arm64)
17+
{
18+
return new RenderContextEGL();
19+
}
20+
else
21+
{
22+
return new RenderContextGLX();
23+
}
1524
}
1625

1726
static void Main(string[] args)

‎Samples/ApplicationTutorial/C#/Projects/linux/ApplicationTutorial-linux.csproj‎

Lines changed: 26 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,48 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
7-
<ProjectGuid>{5B1A5777-5C7F-4CA4-8110-7B94EA8A4F42}</ProjectGuid>
8-
<OutputType>WinExe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>RssReader</RootNamespace>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
116
<AssemblyName>ApplicationTutorial</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
16-
<PublishUrl>publish\</PublishUrl>
17-
<Install>true</Install>
18-
<InstallFrom>Disk</InstallFrom>
19-
<UpdateEnabled>false</UpdateEnabled>
20-
<UpdateMode>Foreground</UpdateMode>
21-
<UpdateInterval>7</UpdateInterval>
22-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23-
<UpdatePeriodically>false</UpdatePeriodically>
24-
<UpdateRequired>false</UpdateRequired>
25-
<MapFileExtensions>true</MapFileExtensions>
26-
<ApplicationRevision>0</ApplicationRevision>
27-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28-
<IsWebBootstrapper>false</IsWebBootstrapper>
29-
<UseApplicationTrust>false</UseApplicationTrust>
30-
<BootstrapperEnabled>true</BootstrapperEnabled>
31-
<OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
32-
</PropertyGroup>
33-
<PropertyGroup>
34-
<StartupObject>
35-
</StartupObject>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
38-
<DebugSymbols>true</DebugSymbols>
39-
<DefineConstants>TRACE;DEBUG;__LINUX__;NOESIS</DefineConstants>
40-
<DebugType>full</DebugType>
41-
<PlatformTarget>x64</PlatformTarget>
42-
<ErrorReport>prompt</ErrorReport>
43-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46-
<DefineConstants>TRACE;__LINUX__;NOESIS</DefineConstants>
47-
<Optimize>true</Optimize>
48-
<DebugType>pdbonly</DebugType>
49-
<PlatformTarget>x64</PlatformTarget>
50-
<ErrorReport>prompt</ErrorReport>
51-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
52-
</PropertyGroup>
53-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
54-
<DebugSymbols>true</DebugSymbols>
55-
<DefineConstants>TRACE;DEBUG;__LINUX__;NOESIS</DefineConstants>
56-
<DebugType>full</DebugType>
57-
<PlatformTarget>x86</PlatformTarget>
58-
<ErrorReport>prompt</ErrorReport>
59-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
60-
</PropertyGroup>
61-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
62-
<DefineConstants>TRACE;__LINUX__;NOESIS</DefineConstants>
63-
<Optimize>true</Optimize>
64-
<DebugType>pdbonly</DebugType>
65-
<PlatformTarget>x86</PlatformTarget>
66-
<ErrorReport>prompt</ErrorReport>
67-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7+
<RootNamespace>RssReader</RootNamespace>
688
</PropertyGroup>
9+
6910
<ItemGroup>
70-
<Reference Include="Microsoft.CSharp" />
71-
<Reference Include="System" />
72-
<Reference Include="System.Core" />
11+
<PackageReference Include="Noesis.App.Displays.X11" Version="2.2.5" />
12+
<PackageReference Include="Noesis.App.RenderContexts.EGL" Version="2.2.5" />
13+
<PackageReference Include="Noesis.App.RenderContexts.GLX" Version="2.2.5" />
7314
</ItemGroup>
15+
16+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
17+
<DefineConstants>DEBUG;TRACE;NOESIS</DefineConstants>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
21+
<DefineConstants>TRACE;NOESIS</DefineConstants>
22+
</PropertyGroup>
23+
7424
<ItemGroup>
7525
<Compile Include="..\..\Src\App.xaml.cs">
7626
<DependentUpon>App.xaml</DependentUpon>
7727
</Compile>
7828
<Compile Include="..\..\Src\MainWindow.xaml.cs">
7929
<DependentUpon>MainWindow.xaml</DependentUpon>
8030
</Compile>
81-
<Compile Include="..\..\Src\Properties\AssemblyInfo.cs">
82-
<Link>Properties\AssemblyInfo.cs</Link>
83-
</Compile>
84-
<Compile Include="App.cs" />
85-
</ItemGroup>
86-
<ItemGroup>
87-
<EmbeddedResource Include="..\..\Src\Roboto-Bold.ttf">
88-
<Link>Roboto-Bold.ttf</Link>
89-
</EmbeddedResource>
90-
<EmbeddedResource Include="..\..\Src\Roboto-Regular.ttf">
91-
<Link>Roboto-Regular.ttf</Link>
92-
</EmbeddedResource>
9331
</ItemGroup>
32+
9433
<ItemGroup>
9534
<EmbeddedResource Include="..\..\Src\App.xaml">
9635
<SubType>Designer</SubType>
9736
</EmbeddedResource>
9837
<EmbeddedResource Include="..\..\Src\MainWindow.xaml">
9938
<SubType>Designer</SubType>
10039
</EmbeddedResource>
40+
<EmbeddedResource Include="..\..\Src\Roboto-Bold.ttf">
41+
<Link>Roboto-Bold.ttf</Link>
42+
</EmbeddedResource>
43+
<EmbeddedResource Include="..\..\Src\Roboto-Regular.ttf">
44+
<Link>Roboto-Regular.ttf</Link>
45+
</EmbeddedResource>
10146
</ItemGroup>
102-
<ItemGroup>
103-
<PackageReference Include="Noesis.App.Displays.X11">
104-
<Version>2.2.4</Version>
105-
</PackageReference>
106-
<PackageReference Include="Noesis.App.RenderContexts.GLX">
107-
<Version>2.2.4</Version>
108-
</PackageReference>
109-
</ItemGroup>
110-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
111-
<PropertyGroup>
112-
<PostBuildEvent>
113-
</PostBuildEvent>
114-
</PropertyGroup>
115-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
116-
Other similar extension points exist, see Microsoft.Common.targets.
117-
<Target Name="BeforeBuild">
118-
</Target>
119-
<Target Name="AfterBuild">
120-
</Target>
121-
-->
47+
12248
</Project>

‎Samples/ApplicationTutorial/C#/Projects/osx/ApplicationTutorial-osx.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@
8282
</ItemGroup>
8383
<ItemGroup>
8484
<PackageReference Include="Noesis.App.Displays.AppKit">
85-
<Version>2.2.4</Version>
85+
<Version>2.2.5</Version>
8686
</PackageReference>
8787
<PackageReference Include="Noesis.App.RenderContexts.MTL">
88-
<Version>2.2.4</Version>
88+
<Version>2.2.5</Version>
8989
</PackageReference>
9090
<PackageReference Include="Noesis.App.RenderContexts.NSGL">
91-
<Version>2.2.4</Version>
91+
<Version>2.2.5</Version>
9292
</PackageReference>
9393
</ItemGroup>
9494
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />

‎Samples/ApplicationTutorial/C#/Projects/uwp/ApplicationTutorial-uwp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@
124124
<Version>6.2.8</Version>
125125
</PackageReference>
126126
<PackageReference Include="Noesis.App.Displays.WinRT">
127-
<Version>2.2.4</Version>
127+
<Version>2.2.5</Version>
128128
</PackageReference>
129129
<PackageReference Include="Noesis.App.RenderContexts.D3D11">
130-
<Version>2.2.4</Version>
130+
<Version>2.2.5</Version>
131131
</PackageReference>
132132
</ItemGroup>
133133
<ItemGroup>

‎Samples/ApplicationTutorial/C#/Projects/windows/ApplicationTutorial-windows.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
</ItemGroup>
9494
<ItemGroup>
9595
<PackageReference Include="Noesis.App.Displays.Win32">
96-
<Version>2.2.4</Version>
96+
<Version>2.2.5</Version>
9797
</PackageReference>
9898
<PackageReference Include="Noesis.App.RenderContexts.D3D11">
99-
<Version>2.2.4</Version>
99+
<Version>2.2.5</Version>
100100
</PackageReference>
101101
</ItemGroup>
102102
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Samples/BlendTutorial/C#/Projects/android/BlendTutorial-android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@
161161
</ItemGroup>
162162
<ItemGroup>
163163
<PackageReference Include="Noesis.App.Displays.Android">
164-
<Version>2.2.4</Version>
164+
<Version>2.2.5</Version>
165165
</PackageReference>
166166
<PackageReference Include="Noesis.App.RenderContexts.EGL">
167-
<Version>2.2.4</Version>
167+
<Version>2.2.5</Version>
168168
</PackageReference>
169169
</ItemGroup>
170170
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎Samples/BlendTutorial/C#/Projects/blend/BlendTutorial-blend.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@
8686
</ItemGroup>
8787
<ItemGroup>
8888
<Resource Include="..\..\Src\Fonts\WeblySleek_UI_Normal.ttf">
89-
<Link>Fonts/WeblySleek_UI_Normal.ttf</Link>
89+
<Link>Fonts/WeblySleek_UI_Normal.ttf</Link>
9090
</Resource>
9191
</ItemGroup>
9292
<ItemGroup>
9393
<None Include="..\..\Src\App.config" />
9494
<AppDesigner Include="..\..\Src\Properties\" />
9595
<Compile Include="..\..\Src\Properties\AssemblyInfo.cs">
96-
<Link>Properties/AssemblyInfo.cs</Link>
96+
<Link>Properties/AssemblyInfo.cs</Link>
9797
<SubType>Code</SubType>
9898
</Compile>
9999
</ItemGroup>
100100
<ItemGroup>
101101
<PackageReference Include="Noesis.GUI.Extensions">
102-
<Version>2.2.2</Version>
102+
<Version>2.2.5</Version>
103103
</PackageReference>
104104
</ItemGroup>
105105
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)