diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 97fefab..348c224 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -18,12 +18,7 @@ jobs: - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '5.0.x' - - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: '7.0.202' + version: '8.0.203' - task: gitversion/setup@0 retryCountOnTaskFailure: 3 @@ -43,25 +38,25 @@ jobs: echo "##vso[task.setvariable variable=JavaSdkDirectory]$(JAVA_HOME_11_X64)" displayName: Select JDK 11 - - task: MSBuild@1 - inputs: - solution: $(Solution) - msbuildLocationMethod: version - msbuildVersion: latest - msbuildArchitecture: x86 - msbuildArguments: /r /p:Configuration=Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /detailedsummary - clean: false - maximumCpuCount: true - restoreNugetPackages: false - logProjectEvents: false - createLogFile: false - + - powershell: | + & dotnet tool update --global uno.check --version 1.20.2 --add-source https://api.nuget.org/v3/index.json + & uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac + displayName: Install .NET Workloads + errorActionPreference: continue + ignoreLASTEXITCODE: true + retryCountOnTaskFailure: 3 + + - pwsh: | + dotnet build -f net8.0-android -c Release "-p:InformationalVersion=$(GitVersion.InformationalVersion)" "$(Build.SourcesDirectory)\CSharp\Uno\RayTraceBenchmark\RayTraceBenchmark\Uno.RayTraceBenchmark.csproj" /bl:$(Build.SourcesDirectory)\build\wasm-aot.binlog + + - task: PublishBuildArtifacts@1 - displayName: Publish Package Artifacts + condition: always() + displayName: Publish Logs Artifacts inputs: - pathToPublish: 'CSharp\Uno\RayTraceBenchmark\RayTraceBenchmark.Wasm\bin\Release\net7.0\dist' + pathToPublish: $(Build.SourcesDirectory)/build artifactType: container - artifactName: RayTraceBenchmark-Wasm + artifactName: Logs - job: Linux container: unoplatform/wasm-build:3.0 @@ -75,21 +70,10 @@ jobs: steps: - - task: UseDotNet@2 - displayName: 'Use .Net Core runtime 3.1.12' - inputs: - packageType: runtime - version: 3.1.12 - - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '5.0.x' - - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: '7.0.x' + version: '8.0.203' - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') }}: - template: .vsts-ci.canaries.yml @@ -120,18 +104,26 @@ jobs: version: 5.0.203 - bash: | - dotnet build /r /p:Configuration=Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" "$(Build.SourcesDirectory)/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.csproj" + dotnet build -f net8.0-browserwasm -c Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" "$(Build.SourcesDirectory)/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Uno.RayTraceBenchmark.csproj" /bl:$(Build.SourcesDirectory)/build/wasm-aot.binlog - task: CopyFiles@2 displayName: 'Publish Wasm Binaries' inputs: - SourceFolder: '$(Build.SourcesDirectory)/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/bin/Release/net7.0/dist' + SourceFolder: '$(Build.SourcesDirectory)/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/bin/Release/net8.0-browserwasm/dist' Contents: '**/*.*' TargetFolder: $(Build.ArtifactStagingDirectory)/wasm CleanTargetFolder: false OverWrite: false flattenFolders: false + - task: PublishBuildArtifacts@1 + condition: always() + displayName: Publish Logs Artifacts + inputs: + pathToPublish: $(Build.SourcesDirectory)/build + artifactType: container + artifactName: Logs + - task: PublishBuildArtifacts@1 inputs: PathtoPublish: $(Build.ArtifactStagingDirectory) diff --git a/CSharp/Uno/NuGet.Config b/CSharp/Uno/NuGet.Config index e3327ea..c16a2c3 100644 --- a/CSharp/Uno/NuGet.Config +++ b/CSharp/Uno/NuGet.Config @@ -1,7 +1,7 @@  - - - + + + - \ No newline at end of file + diff --git a/CSharp/Uno/RayTraceBenchmark/Directory.Build.props b/CSharp/Uno/RayTraceBenchmark/Directory.Build.props new file mode 100644 index 0000000..d2381d9 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/Directory.Build.props @@ -0,0 +1,15 @@ + + + enable + enable + true + + + $(NoWarn);NU1507;NETSDK1201;PRI257 + + diff --git a/CSharp/Uno/RayTraceBenchmark/Directory.Build.targets b/CSharp/Uno/RayTraceBenchmark/Directory.Build.targets new file mode 100644 index 0000000..f75adf7 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/CSharp/Uno/RayTraceBenchmark/Directory.Packages.props b/CSharp/Uno/RayTraceBenchmark/Directory.Packages.props new file mode 100644 index 0000000..d1c75f2 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/Directory.Packages.props @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Main.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Main.cs deleted file mode 100644 index b165f29..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Main.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Microsoft.Extensions.Logging; -using Uno.Extensions; - -namespace RayTraceBenchmark.Droid -{ - [global::Android.App.ApplicationAttribute( - Label = "@string/ApplicationName", - LargeHeap = true, - HardwareAccelerated = true, - Theme = "@style/AppTheme" - )] - public class Application : Windows.UI.Xaml.NativeApplication - { - public Application(IntPtr javaReference, JniHandleOwnership transfer) - : base(() => new App(), javaReference, transfer) - { - } - } -} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/MainActivity.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/MainActivity.cs deleted file mode 100644 index eae1875..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/MainActivity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Android.App; -using Android.Widget; -using Android.OS; -using Android.Content.PM; -using Android.Views; - -namespace RayTraceBenchmark.Droid -{ - [Activity( - MainLauncher = true, - ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, - WindowSoftInputMode = SoftInput.AdjustPan | SoftInput.StateHidden - )] - public class MainActivity : Windows.UI.Xaml.ApplicationActivity - { - } -} - diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AndroidManifest.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AndroidManifest.xml deleted file mode 100644 index 4f0abce..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AssemblyInfo.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AssemblyInfo.cs deleted file mode 100644 index d156177..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnoQuickStart.Droid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart.Droid")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/RayTraceBenchmark.Droid.csproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/RayTraceBenchmark.Droid.csproj deleted file mode 100644 index 95ea28a..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/RayTraceBenchmark.Droid.csproj +++ /dev/null @@ -1,105 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {0A836C36-7AE2-4B06-8A3B-73081528BFCD} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - RayTraceBenchmark.Droid - RayTraceBenchmark.Droid - 512 - true - Resources\Resource.Designer.cs - Off - False - v12.0 - Properties\AndroidManifest.xml - True - ..\RayTraceBenchmark.Shared\Strings - - - true - full - false - bin\Debug\ - TRACE;DEBUG;UWP - prompt - 4 - True - None - true - - - pdbonly - true - true - true - bin\Release\ - TRACE;UWP - prompt - 4 - False - SdkOnly - true - false - false - false - false - - - - - - - - - - - - - 4.7.0-dev.109 - - - - - 4.7.0-dev.109 - - - 1.44.0-dev.37 - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/drawable/Icon.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/drawable/Icon.png deleted file mode 100644 index 8074c4c..0000000 Binary files a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/drawable/Icon.png and /dev/null differ diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Strings.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Strings.xml deleted file mode 100644 index 1eed421..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - RayTraceBenchmark - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Styles.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Styles.xml deleted file mode 100644 index d668a8e..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/values/Styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.projitems b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.projitems deleted file mode 100644 index a7da3a6..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.projitems +++ /dev/null @@ -1,53 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 6279c845-92f8-4333-ab99-3d213163593c - - - RayTraceBenchmark.Shared - - - - Designer - MSBuild:Compile - - - - - App.xaml - - - MainPage.xaml - - - RayTracerControl.xaml - - - Benchmark.cs - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.shproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.shproj deleted file mode 100644 index 3cde9f9..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTraceBenchmark.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 6279c845-92f8-4333-ab99-3d213163593c - 14.0 - - - - - - - - diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Package.appxmanifest b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Package.appxmanifest deleted file mode 100644 index f9599ae..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Package.appxmanifest +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - RayTraceBenchmark - RayTraceBenchmark - Assets\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/AssemblyInfo.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index 1e69d08..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnoQuickStart")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/Default.rd.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/Default.rd.xml deleted file mode 100644 index 80a960c..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/Properties/Default.rd.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP.csproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP.csproj deleted file mode 100644 index 9ee82d2..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP.csproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - 6.2.13 - - - 7.1.2 - - - 2.7.1 - - - 4.3.1 - - - - true - - - Debug - x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17} - AppContainerExe - Properties - RayTraceBenchmark - RayTraceBenchmark - en-US - UAP - 10.0.22000.0 - 10.0.17763.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - RayTraceBenchmark.Uwp_TemporaryKey.pfx - - - true - bin\x86\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - false - - - - - - - - - - Designer - - - - - - - - - 14.0 - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP_TemporaryKey.pfx b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP_TemporaryKey.pfx deleted file mode 100644 index 7129b71..0000000 Binary files a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.UWP/RayTraceBenchmark.UWP_TemporaryKey.pfx and /dev/null differ diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Fonts/winjs-symbols.woff2 b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Fonts/winjs-symbols.woff2 deleted file mode 100644 index 615c0a4..0000000 Binary files a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Fonts/winjs-symbols.woff2 and /dev/null differ diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Properties/launchSettings.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Properties/launchSettings.json deleted file mode 100644 index 641214e..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:53325/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "RayTraceBenchmark.Wasm": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:53326/" - } - } -} \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.csproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.csproj deleted file mode 100644 index 4e713a3..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - Exe - net7.0 - NU1701 - $(DefineConstants);UWP - - true - InterpreterAndAOT - true - - true - - false - - 16 - - - - - RayTraceBenchmark.Wasm.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.xml deleted file mode 100644 index cb918e5..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/RayTraceBenchmark.Wasm.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmCSS/Fonts.css b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmCSS/Fonts.css deleted file mode 100644 index 00e838e..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmCSS/Fonts.css +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: "Symbols"; - src: url("Fonts/winjs-symbols.woff2") format('woff'); -} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/web.config b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/web.config deleted file mode 100644 index 1a6b8a0..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/web.config +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Info.plist b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Info.plist deleted file mode 100644 index bd07e1f..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Info.plist +++ /dev/null @@ -1,42 +0,0 @@ - - - - - CFBundleDisplayName - UnoQuickStart.iOS - CFBundleIdentifier - com.companyname.RayTraceBenchmark - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - MinimumOSVersion - - UIDeviceFamily - - 1 - 2 - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Main.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Main.cs deleted file mode 100644 index 7599673..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Main.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UIKit; - -namespace RayTraceBenchmark.iOS -{ - public class Application - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(App)); - } - } -} \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Properties/AssemblyInfo.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index eceb25c..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnoQuickStart.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart.iOS")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/RayTraceBenchmark.iOS.csproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/RayTraceBenchmark.iOS.csproj deleted file mode 100644 index 8133b58..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/RayTraceBenchmark.iOS.csproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - Debug - iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - RayTraceBenchmark.iOS - Resources - RayTraceBenchmark.iOS - - - ..\RayTraceBenchmark.Shared\Strings - 10.0 - - - true - full - false - bin\iPhoneSimulator\Debug - DEBUG;__IOS__;__MOBILE__;__UNIFIED__;UWP - prompt - 4 - false - x86_64 - None - true - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - false - __IOS__;__MOBILE__;__UNIFIED__;UWP - - - true - full - false - bin\iPhone\Debug - DEBUG;__IOS__;__MOBILE__;__UNIFIED__;UWP - prompt - 4 - false - ARM64 - Entitlements.plist - iPhone Developer - true - - - none - true - bin\iPhone\Release - prompt - 4 - Entitlements.plist - ARM64 - false - iPhone Developer - __IOS__;__MOBILE__;__UNIFIED__;UWP - - - none - True - bin\iPhone\Ad-Hoc - prompt - 4 - False - ARM64 - Entitlements.plist - True - Automatic:AdHoc - iPhone Distribution - - - none - True - bin\iPhone\AppStore - prompt - 4 - False - ARM64 - Entitlements.plist - Automatic:AppStore - iPhone Distribution - - - - - - - - - - - - - - - - - - - 4.7.0-dev.109 - - - 4.7.0-dev.109 - - - - - \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Resources/en.lproj/Localizable.strings b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Resources/en.lproj/Localizable.strings deleted file mode 100644 index 6849447..0000000 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Resources/en.lproj/Localizable.strings +++ /dev/null @@ -1,7 +0,0 @@ -/* - WARNING : THIS FILE HAS BEEN GENERATED BY A TOOL DO NOT UPDATE MANUALLY - - Tool name: ResourcesGenerationTask - Source: ..\RayTraceBenchmark.Shared\Strings\en\Resources.resw - */ -"ApplicationName" = "RayTraceBenchmark"; diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/App.xaml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/App.xaml similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/App.xaml rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/App.xaml diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/App.xaml.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/App.xaml.cs similarity index 77% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/App.xaml.cs rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/App.xaml.cs index 03e91af..16d9387 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/App.xaml.cs +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/App.xaml.cs @@ -7,16 +7,16 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; using Windows.Foundation; using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Windows.ApplicationModel.Activation; namespace RayTraceBenchmark { @@ -32,7 +32,6 @@ namespace RayTraceBenchmark public App() { this.InitializeComponent(); - this.Suspending += OnSuspending; } /// @@ -40,7 +39,7 @@ namespace RayTraceBenchmark /// will be used such as when the application is launched to open a specific file. /// /// Details about the launch request and process. - protected override void OnLaunched(LaunchActivatedEventArgs e) + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e) { #if DEBUG if (System.Diagnostics.Debugger.IsAttached) @@ -48,7 +47,7 @@ namespace RayTraceBenchmark // this.DebugSettings.EnableFrameRateCounter = true; } #endif - Frame rootFrame = Windows.UI.Xaml.Window.Current.Content as Frame; + Frame rootFrame = Microsoft.UI.Xaml.Window.Current.Content as Frame; // Do not repeat app initialization when the Window already has content, // just ensure that the window is active @@ -59,16 +58,16 @@ namespace RayTraceBenchmark rootFrame.NavigationFailed += OnNavigationFailed; - if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + if (e.UWPLaunchActivatedEventArgs.PreviousExecutionState == ApplicationExecutionState.Terminated) { //TODO: Load state from previously suspended application } // Place the frame in the current Window - Windows.UI.Xaml.Window.Current.Content = rootFrame; + Microsoft.UI.Xaml.Window.Current.Content = rootFrame; } - if (e.PrelaunchActivated == false) + if (e.UWPLaunchActivatedEventArgs.PrelaunchActivated == false) { if (rootFrame.Content == null) { @@ -78,7 +77,7 @@ namespace RayTraceBenchmark rootFrame.Navigate(typeof(MainPage), e.Arguments); } // Ensure the current window is active - Windows.UI.Xaml.Window.Current.Activate(); + Microsoft.UI.Xaml.Window.Current.Activate(); } } @@ -140,22 +139,22 @@ namespace RayTraceBenchmark builder.AddFilter("Microsoft", LogLevel.Warning); // Generic Xaml events - // builder.AddFilter("Windows.UI.Xaml", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.UIElement", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.FrameworkElement", LogLevel.Trace ); + // builder.AddFilter("Microsoft.UI.Xaml", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.VisualStateGroup", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.StateTriggerBase", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.UIElement", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.FrameworkElement", LogLevel.Trace ); // Layouter specific messages - // builder.AddFilter("Windows.UI.Xaml.Controls", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Controls.Layouter", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Controls.Panel", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.Controls", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.Controls.Layouter", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.Controls.Panel", LogLevel.Debug ); // builder.AddFilter("Windows.Storage", LogLevel.Debug ); // Binding related messages - // builder.AddFilter("Windows.UI.Xaml.Data", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Data", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug ); + // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug ); // Binder memory references tracking // builder.AddFilter("Uno.UI.DataBinding.BinderReferenceHolder", LogLevel.Debug ); diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon.svg b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon.svg new file mode 100644 index 0000000..a15af53 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon_foreground.svg b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon_foreground.svg new file mode 100644 index 0000000..8ffc41a --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Icons/icon_foreground.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/SharedAssets.md b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/SharedAssets.md new file mode 100644 index 0000000..1b84a74 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/SharedAssets.md @@ -0,0 +1,32 @@ +# Shared Assets + +See documentation about assets here: https://github.com/unoplatform/uno/blob/master/doc/articles/features/working-with-assets.md + +## Here is a cheat sheet + +1. Add the image file to the `Assets` directory of a shared project. +2. Set the build action to `Content`. +3. (Recommended) Provide an asset for various scales/dpi + +### Examples + +```text +\Assets\Images\logo.scale-100.png +\Assets\Images\logo.scale-200.png +\Assets\Images\logo.scale-400.png + +\Assets\Images\scale-100\logo.png +\Assets\Images\scale-200\logo.png +\Assets\Images\scale-400\logo.png +``` + +### Table of scales + +| Scale | WinUI | iOS/MacCatalyst | Android | +|-------|:-----------:|:---------------:|:-------:| +| `100` | scale-100 | @1x | mdpi | +| `125` | scale-125 | N/A | N/A | +| `150` | scale-150 | N/A | hdpi | +| `200` | scale-200 | @2x | xhdpi | +| `300` | scale-300 | @3x | xxhdpi | +| `400` | scale-400 | N/A | xxxhdpi | diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Splash/splash_screen.svg b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Splash/splash_screen.svg new file mode 100644 index 0000000..8ffc41a --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/Splash/splash_screen.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/lockscreenlogo.scale-200.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/lockscreenlogo.scale-200.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/lockscreenlogo.scale-200.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/lockscreenlogo.scale-200.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/splashscreen.scale-200.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/splashscreen.scale-200.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/splashscreen.scale-200.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/splashscreen.scale-200.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square150x150logo.scale-200.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square150x150logo.scale-200.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square150x150logo.scale-200.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square150x150logo.scale-200.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square44x44logo.scale-200.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square44x44logo.scale-200.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square44x44logo.scale-200.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square44x44logo.scale-200.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square44x44logo.targetsize-24_altform-unplated.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square44x44logo.targetsize-24_altform-unplated.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/square44x44logo.targetsize-24_altform-unplated.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/square44x44logo.targetsize-24_altform-unplated.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/storelogo.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/storelogo.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/storelogo.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/storelogo.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/wide310x150logo.scale-200.png b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/wide310x150logo.scale-200.png similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Assets/wide310x150logo.scale-200.png rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Assets/wide310x150logo.scale-200.png diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml similarity index 96% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml index 8e2ba1f..d9df6b7 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml @@ -5,7 +5,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:banner="using:Uno.UI.Sample.Banner" xmlns:local="using:RayTraceBenchmark" - xmlns:wct="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:wct="using:CommunityToolkit.WinUI.UI.Controls" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml.cs similarity index 96% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml.cs rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml.cs index 389ecc0..8bb3792 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/MainPage.xaml.cs +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/MainPage.xaml.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; namespace RayTraceBenchmark { diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/AndroidManifest.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/AndroidManifest.xml new file mode 100644 index 0000000..95ae075 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Assets/AboutAssets.txt b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Assets/AboutAssets.txt similarity index 76% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Assets/AboutAssets.txt rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Assets/AboutAssets.txt index ee39886..210a93b 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Assets/AboutAssets.txt +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Assets/AboutAssets.txt @@ -1,3 +1,6 @@ +To add cross-platform image assets for your Uno Platform app, use the Assets folder +in the shared project instead. Assets in this folder are Android-only assets. + Any raw assets you want to be deployed with your application can be placed in this directory (and child directories) and given a Build Action of "AndroidAsset". @@ -16,4 +19,4 @@ public class ReadAsset : Activity Additionally, some Android functions will automatically load asset files: -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file +Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Main.Android.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Main.Android.cs new file mode 100644 index 0000000..fabc959 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Main.Android.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Android.App; +using Android.Content; +using Android.OS; +using Android.Runtime; +using Android.Views; +using Android.Widget; +using Com.Nostra13.Universalimageloader.Core; +using Microsoft.UI.Xaml.Media; + +namespace RayTraceBenchmark.Droid; + +[global::Android.App.ApplicationAttribute( + Label = "@string/ApplicationName", + Icon = "@mipmap/icon", + LargeHeap = true, + HardwareAccelerated = true, + Theme = "@style/AppTheme" +)] +public class Application : Microsoft.UI.Xaml.NativeApplication +{ + public Application(IntPtr javaReference, JniHandleOwnership transfer) + : base(() => new App(), javaReference, transfer) + { + ConfigureUniversalImageLoader(); + } + + private static void ConfigureUniversalImageLoader() + { + // Create global configuration and initialize ImageLoader with this config + ImageLoaderConfiguration config = new ImageLoaderConfiguration + .Builder(Context) + .Build(); + + ImageLoader.Instance.Init(config); + + ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync; + } +} + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/MainActivity.Android.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/MainActivity.Android.cs new file mode 100644 index 0000000..3af1c47 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/MainActivity.Android.cs @@ -0,0 +1,16 @@ +using Android.App; +using Android.Content.PM; +using Android.OS; +using Android.Views; +using Android.Widget; + +namespace uno52test02.Droid; + +[Activity( + MainLauncher = true, + ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges, + WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden +)] +public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity +{ +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/AboutResources.txt b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/AboutResources.txt similarity index 88% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/AboutResources.txt rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/AboutResources.txt index c2bca97..17e3b13 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Droid/Resources/AboutResources.txt +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/AboutResources.txt @@ -1,3 +1,6 @@ +To add cross-platform image assets for your Uno Platform app, use the Assets folder +in the shared project instead. Resources in this folder are Android-only. + Images, layout descriptions, binary blobs and string dictionaries can be included in your application as resource files. Various Android APIs are designed to operate on the resource IDs instead of dealing with images, strings or binary blobs @@ -41,4 +44,4 @@ public class R { You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file +string in the dictionary file values/strings.xml. diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Strings.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Strings.xml new file mode 100644 index 0000000..a924b25 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Strings.xml @@ -0,0 +1,5 @@ + + + Hello World, Click Me! + uno52test02 + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Styles.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Styles.xml new file mode 100644 index 0000000..7ee44f4 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/Resources/values/Styles.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/environment.conf b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/environment.conf new file mode 100644 index 0000000..fa6c2e3 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Android/environment.conf @@ -0,0 +1,2 @@ +# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/ +MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Desktop/Program.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Desktop/Program.cs new file mode 100644 index 0000000..82b8cef --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Desktop/Program.cs @@ -0,0 +1,22 @@ +using Uno.UI.Runtime.Skia; + +namespace RayTraceBenchmark; + +public class Program +{ + [STAThread] + public static void Main(string[] args) + { + App.InitializeLogging(); + + var host = SkiaHostBuilder.Create() + .App(() => new App()) + .UseX11() + .UseLinuxFrameBuffer() + .UseMacOS() + .UseWindows() + .Build(); + + host.Run(); + } +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Entitlements.plist b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Entitlements.plist similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.iOS/Entitlements.plist rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Entitlements.plist diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Info.plist b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Info.plist new file mode 100644 index 0000000..1bb02dd --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ + + + + + UIDeviceFamily + + 2 + + LSApplicationCategoryType + public.app-category.utilities + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/icon.appiconset + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Main.maccatalyst.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 0000000..acc1345 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,14 @@ +using UIKit; + +namespace uno52test02.MacCatalyst; + +public class EntryPoint +{ + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 0000000..69555e4 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/LinkerConfig.xml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/LinkerConfig.xml new file mode 100644 index 0000000..3bb46ae --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/LinkerConfig.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Program.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/Program.cs similarity index 83% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Program.cs rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/Program.cs index 93412cf..8be7bf5 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/Program.cs +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/Program.cs @@ -15,7 +15,7 @@ namespace RayTraceBenchmark.Wasm App.InitializeLogging(); - Windows.UI.Xaml.Application.Start(_ => _app = new App()); + Microsoft.UI.Xaml.Application.Start(_ => _app = new App()); } } } diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmCSS/Fonts.css b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmCSS/Fonts.css new file mode 100644 index 0000000..4fdd605 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmCSS/Fonts.css @@ -0,0 +1,28 @@ +/** + When adding fonts here, make sure to add them using a base64 data uri, otherwise + fonts loading are delayed, and text may get displayed incorrectly. +*/ + +/* https://github.com/unoplatform/uno/issues/3954 */ +@font-face { + font-family: 'Segoe UI'; + src: local('Segoe UI'), local('-apple-system'), local('BlinkMacSystemFont'), local('Inter'), local('Cantarell'), local('Ubuntu'), local('Roboto'), local('Open Sans'), local('Noto Sans'), local('Helvetica Neue'), local('sans-serif'); +} + +@font-face { + font-family: 'Roboto'; + src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Light.ttf) format('truetype'); + font-weight: 300; +} + +@font-face { + font-family: 'Roboto'; + src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Regular.ttf) format('truetype'); + font-weight: 400; +} + +@font-face { + font-family: 'Roboto'; + src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Medium.ttf) format('truetype'); + font-weight: 500; +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/AppManifest.js b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/AppManifest.js similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/AppManifest.js rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/AppManifest.js diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/GoogleAnalytics.d.ts b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/GoogleAnalytics.d.ts similarity index 77% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/GoogleAnalytics.d.ts rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/GoogleAnalytics.d.ts index f14fa45..b56dfc3 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/GoogleAnalytics.d.ts +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/GoogleAnalytics.d.ts @@ -2,6 +2,6 @@ declare namespace Uno.UI.Demo { class Analytics { private static isLoaded; static reportPageView(screenName: string, appName?: string): string; - private static init(screenName, appName); + private static init; } } diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/GoogleAnalytics.js b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/GoogleAnalytics.js similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/WasmScripts/GoogleAnalytics.js rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/WasmScripts/GoogleAnalytics.js diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-full.profile b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-full.profile similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-full.profile rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-full.profile diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-net7.profile b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-net7.profile similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-net7.profile rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-net7.profile diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-new.profile b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-new.profile similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/aot-new.profile rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/aot-new.profile diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/manifest.webmanifest b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/manifest.webmanifest new file mode 100644 index 0000000..f7051f9 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/manifest.webmanifest @@ -0,0 +1,10 @@ +{ + "background_color": "#ffffff", + "description": "uno52test02", + "display": "standalone", + "name": "uno52test02", + "short_name": "uno52test02", + "start_url": "/index.html", + "theme_color": "#ffffff", + "scope": "/" +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/ts/GoogleAnalytics.ts b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/ts/GoogleAnalytics.ts similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/ts/GoogleAnalytics.ts rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/ts/GoogleAnalytics.ts diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/tsconfig.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/tsconfig.json similarity index 55% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/tsconfig.json rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/tsconfig.json index e47c7c6..a524672 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/tsconfig.json +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/tsconfig.json @@ -4,11 +4,13 @@ "declaration": true, "diagnostics": true, "noImplicitAny": true, - "outDir": "WasmScripts", + "outFile": "WasmScripts/GoogleAnalytics.js", + //"inlineSourceMap": true, "locale": "en-US", - "target": "es2015" + "target": "es6" }, "include": [ - "ts/**/*" + "ts/**/*", + "tsBindings/**/*" ] -} +} \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/wwwroot/staticwebapp.config.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/wwwroot/staticwebapp.config.json similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Wasm/wwwroot/staticwebapp.config.json rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/WebAssembly/wwwroot/staticwebapp.config.json diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 0000000..d5147f1 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,22 @@ + + + + + FileSystem + arm64 + win-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 0000000..4fea954 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,22 @@ + + + + + FileSystem + x64 + win-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml new file mode 100644 index 0000000..928cb25 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml @@ -0,0 +1,22 @@ + + + + + FileSystem + x86 + win-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Entitlements.plist b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Entitlements.plist new file mode 100644 index 0000000..24c3103 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Info.plist b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Info.plist new file mode 100644 index 0000000..ea3dcb4 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Info.plist @@ -0,0 +1,43 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + armv7 + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + XSAppIconAssets + Assets.xcassets/icon.appiconset + UIApplicationSupportsIndirectInputEvents + + + + + diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Main.iOS.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Main.iOS.cs new file mode 100644 index 0000000..e0b2ac6 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Main.iOS.cs @@ -0,0 +1,14 @@ +using UIKit; + +namespace uno52test02.iOS; + +public class EntryPoint +{ + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 0000000..69555e4 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Properties/launchSettings.json b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Properties/launchSettings.json new file mode 100644 index 0000000..163e4cb --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Properties/launchSettings.json @@ -0,0 +1,49 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8080", + "sslPort": 0 + } + }, + "profiles": { + // This profile is first in order for dotnet run to pick it up by default + "uno52test02 (WebAssembly)": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5000", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "uno52test02 (WebAssembly IIS Express)": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "uno52test02 (WinAppSDK Unpackaged)": { + "commandName": "Project", + "compatibleTargetFramework": "windows" + }, + "uno52test02 (WinAppSDK Packaged)": { + "commandName": "MsixPackage", + "compatibleTargetFramework": "windows" + }, + "uno52test02 (Desktop)": { + "commandName": "Project", + "compatibleTargetFramework": "desktop" + }, + "uno52test02 (Desktop WSL2)": { + "commandName": "WSL2", + "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Uno.RayTraceBenchmark.dll", + "distributionName": "", + "compatibleTargetFramework": "desktop" + } + } +} diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTracerControl.xaml b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/RayTracerControl.xaml similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTracerControl.xaml rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/RayTracerControl.xaml diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTracerControl.xaml.cs b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/RayTracerControl.xaml.cs similarity index 91% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTracerControl.xaml.cs rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/RayTracerControl.xaml.cs index 3b46479..ac8080d 100644 --- a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/RayTracerControl.xaml.cs +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/RayTracerControl.xaml.cs @@ -8,14 +8,14 @@ using System.Threading.Tasks; using Windows.Foundation; using Windows.Foundation.Collections; using Windows.UI.Core; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Media.Imaging; -using Windows.UI.Xaml.Navigation; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Media.Imaging; +using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Strings/en/Resources.resw b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Strings/en/Resources.resw similarity index 100% rename from CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark.Shared/Strings/en/Resources.resw rename to CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Strings/en/Resources.resw diff --git a/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Uno.RayTraceBenchmark.csproj b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Uno.RayTraceBenchmark.csproj new file mode 100644 index 0000000..fa21973 --- /dev/null +++ b/CSharp/Uno/RayTraceBenchmark/RayTraceBenchmark/Uno.RayTraceBenchmark.csproj @@ -0,0 +1,94 @@ + + + + net8.0-desktop; + net8.0-ios; + net8.0-maccatalyst; + net8.0-windows10.0.19041; + net8.0-browserwasm; + + + $(TargetFrameworks);net8.0-android; + + Exe + true + + + RayTraceBenchmark + + com.companyname.raytracebenchmark + + 1.0 + 1 + + + + + + + + + + + + + + + true + InterpreterAndAOT + true + + true + false + + 16 + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + Benchmark.cs + + + + + + + + + diff --git a/CSharp/Uno/Uno.RayTraceBenchmark.sln b/CSharp/Uno/Uno.RayTraceBenchmark.sln index 1aa7ee2..cc8b320 100644 --- a/CSharp/Uno/Uno.RayTraceBenchmark.sln +++ b/CSharp/Uno/Uno.RayTraceBenchmark.sln @@ -1,265 +1,29 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30021.99 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.34707.107 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RayTraceBenchmark.Shared", "RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.RayTraceBenchmark", "RayTraceBenchmark\RayTraceBenchmark\Uno.RayTraceBenchmark.csproj", "{678AE94B-D567-4586-8495-39B578ED0BAE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTraceBenchmark.Droid", "RayTraceBenchmark\RayTraceBenchmark.Droid\RayTraceBenchmark.Droid.csproj", "{0A836C36-7AE2-4B06-8A3B-73081528BFCD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTraceBenchmark.iOS", "RayTraceBenchmark\RayTraceBenchmark.iOS\RayTraceBenchmark.iOS.csproj", "{9BB383A6-E067-4906-9D21-34A320EBBFCC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTraceBenchmark.UWP", "RayTraceBenchmark\RayTraceBenchmark.UWP\RayTraceBenchmark.UWP.csproj", "{DB4D6774-EED9-4830-8DC1-F26CBFF33D17}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RayTraceBenchmark.Wasm", "RayTraceBenchmark\RayTraceBenchmark.Wasm\RayTraceBenchmark.Wasm.csproj", "{7DB0F56B-25D4-485C-B812-D554ACFC4D50}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{848B83C9-048E-4BDF-9CBE-F1A360BB749C}" + ProjectSection(SolutionItems) = preProject + RayTraceBenchmark\Directory.Build.props = RayTraceBenchmark\Directory.Build.props + RayTraceBenchmark\Directory.Build.targets = RayTraceBenchmark\Directory.Build.targets + RayTraceBenchmark\Directory.Packages.props = RayTraceBenchmark\Directory.Packages.props + global.json = global.json + EndProjectSection EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.projitems*{0a836c36-7ae2-4b06-8a3b-73081528bfcd}*SharedItemsImports = 4 - RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.projitems*{7db0f56b-25d4-485c-b812-d554acfc4d50}*SharedItemsImports = 5 - RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.projitems*{9bb383a6-e067-4906-9d21-34a320ebbfcc}*SharedItemsImports = 4 - RayTraceBenchmark\RayTraceBenchmark.Shared\RayTraceBenchmark.Shared.projitems*{db4d6774-eed9-4830-8dc1-f26cbff33d17}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Ad-Hoc|Any CPU = Ad-Hoc|Any CPU - Ad-Hoc|ARM = Ad-Hoc|ARM - Ad-Hoc|iPhone = Ad-Hoc|iPhone - Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator - Ad-Hoc|x64 = Ad-Hoc|x64 - Ad-Hoc|x86 = Ad-Hoc|x86 - AppStore|Any CPU = AppStore|Any CPU - AppStore|ARM = AppStore|ARM - AppStore|iPhone = AppStore|iPhone - AppStore|iPhoneSimulator = AppStore|iPhoneSimulator - AppStore|x64 = AppStore|x64 - AppStore|x86 = AppStore|x86 Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|Any CPU.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|ARM.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|ARM.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|ARM.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhone.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhone.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x64.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x64.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x64.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x86.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x86.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.AppStore|x86.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|ARM.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|ARM.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhone.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x64.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x64.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x86.Build.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Debug|x86.Deploy.0 = Debug|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|Any CPU.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|Any CPU.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|ARM.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|ARM.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|ARM.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhone.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhone.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhone.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x64.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x64.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x64.Deploy.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x86.ActiveCfg = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x86.Build.0 = Release|Any CPU - {0A836C36-7AE2-4B06-8A3B-73081528BFCD}.Release|x86.Deploy.0 = Release|Any CPU - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|ARM.ActiveCfg = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|iPhone.Build.0 = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|x64.ActiveCfg = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.AppStore|x86.ActiveCfg = AppStore|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|ARM.ActiveCfg = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|iPhone.ActiveCfg = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|iPhone.Build.0 = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|x64.ActiveCfg = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Debug|x86.ActiveCfg = Debug|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|Any CPU.ActiveCfg = Release|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|ARM.ActiveCfg = Release|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|iPhone.ActiveCfg = Release|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|iPhone.Build.0 = Release|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|x64.ActiveCfg = Release|iPhone - {9BB383A6-E067-4906-9D21-34A320EBBFCC}.Release|x86.ActiveCfg = Release|iPhone - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|Any CPU.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|ARM.Build.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhone.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhone.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhone.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x64.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x86.Build.0 = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|Any CPU.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|Any CPU.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|Any CPU.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|ARM.ActiveCfg = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|ARM.Build.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|ARM.Deploy.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhone.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhone.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhone.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhoneSimulator.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x64.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x64.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x64.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x86.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x86.Build.0 = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.AppStore|x86.Deploy.0 = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|Any CPU.ActiveCfg = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|ARM.ActiveCfg = Debug|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|ARM.Build.0 = Debug|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|ARM.Deploy.0 = Debug|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|iPhone.ActiveCfg = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x64.ActiveCfg = Debug|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x64.Build.0 = Debug|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x64.Deploy.0 = Debug|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x86.ActiveCfg = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x86.Build.0 = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Debug|x86.Deploy.0 = Debug|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|Any CPU.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|ARM.ActiveCfg = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|ARM.Build.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|ARM.Deploy.0 = Release|ARM - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|iPhone.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x64.ActiveCfg = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x64.Build.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x64.Deploy.0 = Release|x64 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x86.ActiveCfg = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x86.Build.0 = Release|x86 - {DB4D6774-EED9-4830-8DC1-F26CBFF33D17}.Release|x86.Deploy.0 = Release|x86 - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|ARM.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|iPhone.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|x64.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|x64.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|x86.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.AppStore|x86.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|ARM.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|iPhone.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|x64.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|x64.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|x86.ActiveCfg = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Debug|x86.Build.0 = Debug|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|Any CPU.Build.0 = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|ARM.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|ARM.Build.0 = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|iPhone.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|iPhone.Build.0 = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|x64.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|x64.Build.0 = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|x86.ActiveCfg = Release|Any CPU - {7DB0F56B-25D4-485C-B812-D554ACFC4D50}.Release|x86.Build.0 = Release|Any CPU + {678AE94B-D567-4586-8495-39B578ED0BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {678AE94B-D567-4586-8495-39B578ED0BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {678AE94B-D567-4586-8495-39B578ED0BAE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {678AE94B-D567-4586-8495-39B578ED0BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {678AE94B-D567-4586-8495-39B578ED0BAE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CSharp/Uno/global.json b/CSharp/Uno/global.json new file mode 100644 index 0000000..bb0a1e4 --- /dev/null +++ b/CSharp/Uno/global.json @@ -0,0 +1,6 @@ +{ + // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. + "msbuild-sdks": { + "Uno.Sdk": "5.2.83" + } +}