Skip to content

Commit 7e4cf4d

Browse files
ChrisPulmanChrisPulman
authored
Fix Update samples (#586)
1 parent 786b9f1 commit 7e4cf4d

36 files changed

+632
-362
lines changed

‎samples/.gitignore

+131-82
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,10 @@
1-
# globs
2-
Makefile.in
3-
*.userprefs
4-
*.usertasks
5-
config.make
6-
config.status
7-
aclocal.m4
8-
install-sh
9-
autom4te.cache/
10-
*.tar.gz
11-
tarballs/
12-
test-results/
13-
14-
# Mac bundle stuff
15-
*.dmg
16-
*.app
17-
18-
# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
19-
# General
20-
.DS_Store
21-
.AppleDouble
22-
.LSOverride
23-
24-
# Icon must end with two \r
25-
Icon
26-
27-
28-
# Thumbnails
29-
._*
30-
31-
# Files that might appear in the root of a volume
32-
.DocumentRevisions-V100
33-
.fseventsd
34-
.Spotlight-V100
35-
.TemporaryItems
36-
.Trashes
37-
.VolumeIcon.icns
38-
.com.apple.timemachine.donotpresent
39-
40-
# Directories potentially created on remote AFP share
41-
.AppleDB
42-
.AppleDesktop
43-
Network Trash Folder
44-
Temporary Items
45-
.apdisk
46-
47-
# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
48-
# Windows thumbnail cache files
49-
Thumbs.db
50-
ehthumbs.db
51-
ehthumbs_vista.db
52-
53-
# Dump file
54-
*.stackdump
55-
56-
# Folder config file
57-
[Dd]esktop.ini
58-
59-
# Recycle Bin used on file shares
60-
$RECYCLE.BIN/
61-
62-
# Windows Installer files
63-
*.cab
64-
*.msi
65-
*.msix
66-
*.msm
67-
*.msp
68-
69-
# Windows shortcuts
70-
*.lnk
71-
72-
# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
731
## Ignore Visual Studio temporary files, build results, and
742
## files generated by popular Visual Studio add-ons.
753
##
764
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
775

786
# User-specific files
7+
*.rsuser
798
*.suo
809
*.user
8110
*.userosscache
@@ -84,17 +13,24 @@ $RECYCLE.BIN/
8413
# User-specific files (MonoDevelop/Xamarin Studio)
8514
*.userprefs
8615

16+
# Mono auto generated files
17+
mono_crash.*
18+
8719
# Build results
8820
[Dd]ebug/
8921
[Dd]ebugPublic/
9022
[Rr]elease/
9123
[Rr]eleases/
9224
x64/
9325
x86/
26+
[Ww][Ii][Nn]32/
27+
[Aa][Rr][Mm]/
28+
[Aa][Rr][Mm]64/
9429
bld/
9530
[Bb]in/
9631
[Oo]bj/
9732
[Ll]og/
33+
[Ll]ogs/
9834

9935
# Visual Studio 2015/2017 cache/options directory
10036
.vs/
@@ -108,9 +44,10 @@ Generated\ Files/
10844
[Tt]est[Rr]esult*/
10945
[Bb]uild[Ll]og.*
11046

111-
# NUNIT
47+
# NUnit
11248
*.VisualState.xml
11349
TestResult.xml
50+
nunit-*.xml
11451

11552
# Build Results of an ATL Project
11653
[Dd]ebugPS/
@@ -125,6 +62,12 @@ project.lock.json
12562
project.fragment.lock.json
12663
artifacts/
12764

65+
# Tye
66+
.tye/
67+
68+
# ASP.NET Scaffolding
69+
ScaffoldingReadMe.txt
70+
12871
# StyleCop
12972
StyleCopReport.xml
13073

@@ -191,9 +134,6 @@ _ReSharper*/
191134
*.[Rr]e[Ss]harper
192135
*.DotSettings.user
193136

194-
# JustCode is a .NET coding add-in
195-
.JustCode
196-
197137
# TeamCity is a build add-in
198138
_TeamCity*
199139

@@ -204,6 +144,11 @@ _TeamCity*
204144
.axoCover/*
205145
!.axoCover/settings.json
206146

147+
# Coverlet is a free, cross platform Code Coverage Tool
148+
coverage*.json
149+
coverage*.xml
150+
coverage*.info
151+
207152
# Visual Studio code coverage results
208153
*.coverage
209154
*.coveragexml
@@ -251,6 +196,8 @@ PublishScripts/
251196

252197
# NuGet Packages
253198
*.nupkg
199+
# NuGet Symbol Packages
200+
*.snupkg
254201
# The packages folder can be ignored because of Package Restore
255202
**/[Pp]ackages/*
256203
# except build/, which is used as an MSBuild target.
@@ -275,12 +222,14 @@ BundleArtifacts/
275222
Package.StoreAssociation.xml
276223
_pkginfo.txt
277224
*.appx
225+
*.appxbundle
226+
*.appxupload
278227

279228
# Visual Studio cache files
280229
# files ending in .cache can be ignored
281230
*.[Cc]ache
282231
# but keep track of directories ending in .cache
283-
!*.[Cc]ache/
232+
!?*.[Cc]ache/
284233

285234
# Others
286235
ClientBin/
@@ -324,6 +273,9 @@ ServiceFabricBackup/
324273
*.bim.layout
325274
*.bim_*.settings
326275
*.rptproj.rsuser
276+
*- [Bb]ackup.rdl
277+
*- [Bb]ackup ([0-9]).rdl
278+
*- [Bb]ackup ([0-9][0-9]).rdl
327279

328280
# Microsoft Fakes
329281
FakesAssemblies/
@@ -359,10 +311,6 @@ paket-files/
359311
# FAKE - F# Make
360312
.fake/
361313

362-
# JetBrains Rider
363-
.idea/
364-
*.sln.iml
365-
366314
# CodeRush personal settings
367315
.cr/personal
368316

@@ -402,4 +350,105 @@ ASALocalRun/
402350
.mfractor/
403351

404352
# Local History for Visual Studio
405-
.localhistory/
353+
.localhistory/
354+
355+
# BeatPulse healthcheck temp database
356+
healthchecksdb
357+
358+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
359+
MigrationBackup/
360+
361+
# Ionide (cross platform F# VS Code tools) working folder
362+
.ionide/
363+
364+
# Fody - auto-generated XML schema
365+
FodyWeavers.xsd
366+
367+
##
368+
## Visual studio for Mac
369+
##
370+
371+
372+
# globs
373+
Makefile.in
374+
*.userprefs
375+
*.usertasks
376+
config.make
377+
config.status
378+
aclocal.m4
379+
install-sh
380+
autom4te.cache/
381+
*.tar.gz
382+
tarballs/
383+
test-results/
384+
385+
# Mac bundle stuff
386+
*.dmg
387+
*.app
388+
389+
# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
390+
# General
391+
.DS_Store
392+
.AppleDouble
393+
.LSOverride
394+
395+
# Icon must end with two \r
396+
Icon
397+
398+
399+
# Thumbnails
400+
._*
401+
402+
# Files that might appear in the root of a volume
403+
.DocumentRevisions-V100
404+
.fseventsd
405+
.Spotlight-V100
406+
.TemporaryItems
407+
.Trashes
408+
.VolumeIcon.icns
409+
.com.apple.timemachine.donotpresent
410+
411+
# Directories potentially created on remote AFP share
412+
.AppleDB
413+
.AppleDesktop
414+
Network Trash Folder
415+
Temporary Items
416+
.apdisk
417+
418+
# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
419+
# Windows thumbnail cache files
420+
Thumbs.db
421+
ehthumbs.db
422+
ehthumbs_vista.db
423+
424+
# Dump file
425+
*.stackdump
426+
427+
# Folder config file
428+
[Dd]esktop.ini
429+
430+
# Recycle Bin used on file shares
431+
$RECYCLE.BIN/
432+
433+
# Windows Installer files
434+
*.cab
435+
*.msi
436+
*.msix
437+
*.msm
438+
*.msp
439+
440+
# Windows shortcuts
441+
*.lnk
442+
443+
# JetBrains Rider
444+
.idea/
445+
*.sln.iml
446+
447+
##
448+
## Visual Studio Code
449+
##
450+
.vscode/*
451+
!.vscode/settings.json
452+
!.vscode/tasks.json
453+
!.vscode/launch.json
454+
!.vscode/extensions.json

‎samples/AvaloniaApplication1.Desktop/AvaloniaApplication1.Desktop.csproj

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
5+
One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
6+
<TargetFramework>net7.0</TargetFramework>
7+
<Nullable>enable</Nullable>
8+
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
9+
<ApplicationManifest>app.manifest</ApplicationManifest>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<ProjectReference Include="..\AvaloniaApplication1\AvaloniaApplication1.csproj" />
18+
</ItemGroup>
19+
</Project>

‎samples/AvaloniaApplication1.Desktop/Program.cs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
3+
using Avalonia;
4+
using Avalonia.ReactiveUI;
5+
6+
namespace AvaloniaApplication1.Desktop;
7+
8+
class Program
9+
{
10+
// Initialization code. Don't use any Avalonia, third-party APIs or any
11+
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
12+
// yet and stuff might break.
13+
[STAThread]
14+
public static void Main(string[] args) => BuildAvaloniaApp()
15+
.StartWithClassicDesktopLifetime(args);
16+
17+
// Avalonia configuration, don't remove; also used by visual designer.
18+
public static AppBuilder BuildAvaloniaApp()
19+
=> AppBuilder.Configure<App>()
20+
.UsePlatformDetect()
21+
.WithInterFont()
22+
.LogToTrace()
23+
.UseReactiveUI();
24+
}

‎samples/AvaloniaApplication1.Desktop/app.manifest

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<!-- This manifest is used on Windows only.
4+
Don't remove it as it might cause problems with window transparency and embeded controls.
5+
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
6+
<assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
7+
8+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
9+
<application>
10+
<!-- A list of the Windows versions that this application has been tested on
11+
and is designed to work with. Uncomment the appropriate elements
12+
and Windows will automatically select the most compatible environment. -->
13+
14+
<!-- Windows 10 -->
15+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
16+
</application>
17+
</compatibility>
18+
</assembly>

‎samples/AvaloniaApplication1/App.axaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Application xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
x:Class="AvaloniaApplication1.App"
4+
RequestedThemeVariant="Default">
5+
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
6+
7+
<Application.Styles>
8+
<FluentTheme />
9+
</Application.Styles>
10+
</Application>

0 commit comments

Comments
 (0)