Merge branch 'feature/new-packaging' into feature/2.0
8 years ago
Authored
GoldenTao# Conflicts:
# EarTrumpet.UWP/EarTrumpet.UWP.csproj
# EarTrumpet.UWP/Package.appxmanifest
# EarTrumpet.vs15.sln
# EarTrumpet/MainWindow.xaml
Parentsc24c86e90b952b
99 files changed
- EarTrumpet.Package/Assets/Application.png——
- EarTrumpet.Package/Assets/SplashScreen.png——
- EarTrumpet.Package/Assets/SplashScreen.scale-200.png——
- EarTrumpet.Package/Assets/Square150x150Logo.png——
- EarTrumpet.Package/Assets/Square150x150Logo.scale-200.png——
- EarTrumpet.Package/Assets/Square150x150Logo.scale-400.png——
- EarTrumpet.Package/Assets/Square44x44Logo.png——
EarTrumpet.Package/Assets/Square44x44Logo.scale-200.png
—
—
EarTrumpet.Package/Assets/Square44x44Logo.scale-400.png——EarTrumpet.Package/Assets/Square44x44Logo.targetsize-24_altform-unplated.png——EarTrumpet.Package/Assets/Square44x44LogoDark.scale-200.png——EarTrumpet.Package/Assets/StoreLogo.png——EarTrumpet.Package/Assets/Wide310x150Logo.png——EarTrumpet.Package/Assets/Wide310x150Logo.scale-100.png——EarTrumpet.Package/Assets/Wide310x150Logo.scale-200.png——EarTrumpet.Package/Assets/Wide310x150Logo.scale-400.png——EarTrumpet.Package/Assets/welcome.gif——EarTrumpet.Package/EarTrumpet.Package.wapproj+74−0EarTrumpet.Package/Package.appxmanifest+70−0EarTrumpet.UWP/Assets/SplashScreen.png——EarTrumpet.UWP/EarTrumpet.UWP.csproj+4−38EarTrumpet.UWP/FeedbackTask.cs+43−0EarTrumpet.UWP/Package.appxmanifest+16−39EarTrumpet.UWP/Registry.dat——EarTrumpet.UWP/UpdateTask.cs+19−0EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Deployment.srd——EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Deployment.srd-shm——EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Deployment.srd-wal+0−0EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Machine.srd——EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Machine.srd-shm——EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/AppRepository/StateRepository-Machine.srd-wal+0−0EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/Start Menu/Ear Trumpet.lnk——EarTrumpet.UWP/VFS/Common AppData/Microsoft/Windows/Start Menu/Programs/StartUp/Ear Trumpet.lnk——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{74d0e5db-b326-4dae-a6b2-445b9de1836e}/VC_redist.x86.exe——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{74d0e5db-b326-4dae-a6b2-445b9de1836e}/state.rsm——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}v14.0.23026/packages/vcRuntimeMinimum_x86/cab1.cab——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}v14.0.23026/packages/vcRuntimeMinimum_x86/vc_runtimeMinimum_x86.msi——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}v14.0.23026/packages/vcRuntimeAdditional_x86/cab1.cab——EarTrumpet.UWP/VFS/Common AppData/Package Cache/{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}v14.0.23026/packages/vcRuntimeAdditional_x86/vc_runtimeAdditional_x86.msi——EarTrumpet.UWP/VFS/Common AppData/regid.1991-06.com.microsoft/regid.1991-06.com.microsoft_Windows-10-Enterprise-Insider-Preview.swidtag——EarTrumpet.UWP/VFS/SystemX86/concrt140.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140chs.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140cht.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140deu.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140enu.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140esn.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140fra.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140ita.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140jpn.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140kor.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140rus.dll——EarTrumpet.UWP/VFS/SystemX86/mfc140u.dll——EarTrumpet.UWP/VFS/SystemX86/mfcm140.dll——EarTrumpet.UWP/VFS/SystemX86/mfcm140u.dll——EarTrumpet.UWP/VFS/SystemX86/msvcp140.dll——EarTrumpet.UWP/VFS/SystemX86/vcamp140.dll——EarTrumpet.UWP/VFS/SystemX86/vccorlib140.dll——EarTrumpet.UWP/VFS/SystemX86/vcomp140.dll——EarTrumpet.UWP/VFS/SystemX86/vcruntime140.dll——EarTrumpet.UWP/VFS/Windows/INF/audioendpoint.PNF——EarTrumpet.UWP/VFS/Windows/INF/hidserv.PNF——EarTrumpet.UWP/VFS/Windows/INF/input.PNF——EarTrumpet.UWP/VFS/Windows/INF/keyboard.PNF——EarTrumpet.UWP/VFS/Windows/INF/monitor.PNF——EarTrumpet.UWP/VFS/Windows/INF/msmouse.PNF——EarTrumpet.UWP/VFS/Windows/INF/printqueue.PNF——EarTrumpet.UWP/VFS/Windows/INF/usb.PNF——EarTrumpet.UWP/VFS/Windows/INF/wdma_usb.PNF——EarTrumpet.UWP/VFS/Windows/Panther/UnattendGC/diagerr.xml+0−186EarTrumpet.UWP/VFS/Windows/Panther/UnattendGC/diagwrn.xml+0−189EarTrumpet.UWP/VFS/Windows/Prefetch/AgAppLaunch.db——EarTrumpet.UWP/VFS/Windows/Prefetch/AgGlFaultHistory.db——EarTrumpet.UWP/VFS/Windows/Prefetch/AgGlFgAppHistory.db——EarTrumpet.UWP/VFS/Windows/Prefetch/AgGlGlobalHistory.db——EarTrumpet.UWP/VFS/Windows/Prefetch/AgRobust.db——EarTrumpet.UWP/VFS/Windows/Prefetch/DLLHOST.EXE-71214090.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/DLLHOST.EXE-BBB8B3DE.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/DLLHOST.EXE-EBC0C559.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/PfPre_1266f8dd.mkd——EarTrumpet.UWP/VFS/Windows/Prefetch/PfSvPerfStats.bin——EarTrumpet.UWP/VFS/Windows/Prefetch/ResPriStaticDb.ebd——EarTrumpet.UWP/VFS/Windows/Prefetch/SEARCHFILTERHOST.EXE-AA7A1FDD.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/SEARCHPROTOCOLHOST.EXE-AFAD3EF9.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/SEARCHUI.EXE-05BE3360.pf——EarTrumpet.UWP/VFS/Windows/Prefetch/SHELLEXPERIENCEHOST.EXE-9083E931.pf——EarTrumpet.UWP/VFS/Windows/ServiceProfiles/LocalService/AppData/Local/FontCache/~FontCache-FontFace.dat——EarTrumpet.UWP/VFS/Windows/ServiceProfiles/LocalService/AppData/Local/FontCache/~FontCache-S-1-5-93-2-1.dat——EarTrumpet.UWP/VFS/Windows/ServiceProfiles/LocalService/AppData/Local/FontCache/~FontCache-System.dat——EarTrumpet.UWP/VFS/Windows/ServiceProfiles/LocalService/winhttp/cachev3.dat+0−0EarTrumpet.UWP/VFS/Windows/ServiceProfiles/NetworkService/NTUSER.DAT——EarTrumpet.UWP/VFS/Windows/ServiceProfiles/NetworkService/NTUSER.DAT.LOG1+0−0EarTrumpet.UWP/VFS/Windows/ServiceProfiles/NetworkService/NTUSER.DAT.LOG2——EarTrumpet.UWP/VFS/Windows/appcompat/Programs/Amcache.hve——EarTrumpet.UWP/VFS/Windows/appcompat/Programs/Amcache.hve.LOG1——EarTrumpet.UWP/VFS/Windows/appcompat/Programs/Amcache.hve.LOG2+0−0EarTrumpet.UWP/VFS/Windows/bootstat.dat——EarTrumpet.UWP/VFS/Windows/win.ini+0−7EarTrumpet.vs15.sln+26−21