Resolved conflict

VisualNodeDev · Nov 30, 2024 · c8398cf · c8398cf
2 parents f41407b + b93a6e2
commit c8398cf
Show file tree

Hide file tree

Showing 14 changed files with 143 additions and 67 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -115,36 +115,134 @@ jobs:
       with:
         dotnet-version: 9.0.x
 
-    - name: Publish Web Server framework dependent (Windows)
+      # ------------------------------------------------------------------------- Windows
+    - name: Publish Web Server framework dependent (Windows x64)
       working-directory: ./src/NodeDev.Blazor.Server
       run: dotnet publish -c Release --runtime win-x64 --self-contained false -p:PublishSingleFile=true
+
+    - name: Zip Web Server framework dependent (Windows x64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-x64/publish/* -DestinationPath ./Windows_x64_WebServer.zip
+
 
-    - name: Publish Web Server framework dependent (Linux)
+    - name: Publish Web Server self contained (Windows x64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime win-x64 --self-contained true -p:PublishSingleFile=true
+
+    - name: Zip Web Server self contained (Windows x64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-x64/publish/* -DestinationPath ./Windows_x64_WebServer_SelfContained.zip
+
+
+    - name: Publish Web Server framework dependent (Windows arm64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime win-arm64 --self-contained false -p:PublishSingleFile=true
+
+    - name: Zip Web Server framework dependent (Windows arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-arm64/publish/* -DestinationPath ./Windows_arm64_WebServer.zip
+
+
+    - name: Publish Web Server self contained (Windows arm64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime win-arm64 --self-contained true -p:PublishSingleFile=true
+
+    - name: Zip Web Server self contained (Windows arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-arm64/publish/* -DestinationPath ./Windows_arm64_WebServer_SelfContained.zip
+
+
+      # ------------------------------------------------------------------------- Linux
+    - name: Publish Web Server framework dependent (Linux x64)
       working-directory: ./src/NodeDev.Blazor.Server
       run: dotnet publish -c Release --runtime linux-x64 --self-contained false -p:PublishSingleFile=true
 
-    - name: Publish Desktop framework dependent (Windows)
-      working-directory: ./src/NodeDev.Blazor.MAUI
+    - name: Zip Web Server self contained (Linux x64)
       shell: pwsh
-      run: ./publishAndCleanup.ps1
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/linux-x64/publish/* -DestinationPath ./Linux_x64_WebServer.zip
 
-    - name: Zip Web Server framework dependent (Windows)
+
+    - name: Publish Web Server self contained (Linux x64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime linux-x64 --self-contained true -p:PublishSingleFile=true
+
+    - name: Zip Web Server self contained (Linux x64)
       shell: pwsh
-      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-x64/publish/* -DestinationPath ./Windows_x64_WebServer.zip
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/linux-x64/publish/* -DestinationPath ./Linux_x64_WebServer_SelfContained.zip
+
+
+    - name: Publish Web Server framework dependent (Linux arm64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime linux-arm64 --self-contained false -p:PublishSingleFile=true
+
+    - name: Zip Web Server self contained (Linux arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/linux-arm64/publish/* -DestinationPath ./Linux_arm64_WebServer.zip
 
-    - name: Zip Desktop framework dependent (Windows)
+
+    - name: Publish Web Server self contained (Linux arm64)
+      working-directory: ./src/NodeDev.Blazor.Server
+      run: dotnet publish -c Release --runtime linux-arm64 --self-contained true -p:PublishSingleFile=true
+
+    - name: Zip Web Server self contained (Linux arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/linux-arm64/publish/* -DestinationPath ./Linux_arm64_WebServer_SelfContained.zip
+
+      # ------------------------------------------------------------------------- Windows MAUI
+    - name: Publish Desktop framework dependent (Windows x64)
+      working-directory: ./src/NodeDev.Blazor.MAUI
+      shell: pwsh
+      run: ./publishAndCleanup.ps1 -architecture "win-x64" -selfContained $False
+
+    - name: Zip Web Server framework dependent (Windows x64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-x64/publish/* -DestinationPath ./Windows_x64_DesktopApp.zip
+
+
+    - name: Publish Desktop self contained (Windows x64)
+      working-directory: ./src/NodeDev.Blazor.MAUI
+      shell: pwsh
+      run: ./publishAndCleanup.ps1 -architecture "win-x64" -selfContained $True
+
+    - name: Zip Web Server self contained (Windows x64)
       shell: pwsh
-      run: Compress-Archive -Path ./src/NodeDev.Blazor.MAUI/bin/Release/net9.0-windows10.0.19041.0/win-x64/publish/* -DestinationPath ./Windows_x64_DesktopApp.zip
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-x64/publish/* -DestinationPath ./Windows_x64_DesktopApp_SelfContained.zip
 
-    - name: Zip Web Server framework dependent (Linux)
+
+    - name: Publish Desktop framework dependent (Windows arm64)
+      working-directory: ./src/NodeDev.Blazor.MAUI
       shell: pwsh
-      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/linux-x64/publish/* -DestinationPath ./Linux_x64_WebServer.zip
-
+      run: ./publishAndCleanup.ps1 -architecture "win-arm64" -selfContained $False
+
+    - name: Zip Web Server framework dependent (Windows arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-arm64/publish/* -DestinationPath ./Windows_arm64_DesktopApp.zip
+
+
+    - name: Publish Desktop self contained (Windows arm64)
+      working-directory: ./src/NodeDev.Blazor.MAUI
+      shell: pwsh
+      run: ./publishAndCleanup.ps1 -architecture "win-arm64" -selfContained $True
+
+    - name: Zip Web Server self contained (Windows arm64)
+      shell: pwsh
+      run: Compress-Archive -Path ./src/NodeDev.Blazor.Server/bin/Release/net9.0/win-arm64/publish/* -DestinationPath ./Windows_arm64_DesktopApp_SelfContained.zip
+
     - name: Create Release
       uses: softprops/action-gh-release@v2
       with:
         files: |
           ./Windows_x64_WebServer.zip
+          ./Windows_x64_WebServer_SelfContained.zip
           ./Windows_x64_DesktopApp.zip
+          ./Windows_x64_DesktopApp_SelfContained.zip
+          ./Windows_arm64_WebServer.zip
+          ./Windows_arm64_WebServer_SelfContained.zip
+          ./Windows_arm64_DesktopApp.zip
+          ./Windows_arm64_DesktopApp_SelfContained.zip
           ./Linux_x64_WebServer.zip
+          ./Linux_x64_WebServer_SelfContained.zip
+          ./Linux_arm64_WebServer.zip
+          ./Linux_arm64_WebServer_SelfContained.zip
+
 
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -98,4 +98,8 @@ csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
 csharp_style_prefer_tuple_swap = true:suggestion
 csharp_style_prefer_utf8_string_literals = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
-csharp_style_deconstructed_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/src/Blazor.Diagrams b/src/Blazor.Diagrams
diff --git a/src/Dis2Msil b/src/Dis2Msil
diff --git a/src/NodeDev.Blazor.MAUI/NodeDev.Blazor.MAUI.csproj b/src/NodeDev.Blazor.MAUI/NodeDev.Blazor.MAUI.csproj
@@ -56,9 +56,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.10" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NodeDev.Blazor.MAUI/publishAndCleanup.ps1 b/src/NodeDev.Blazor.MAUI/publishAndCleanup.ps1
@@ -1,13 +1,18 @@
+param (
+    [string]$architecture,
+	[bool]$selfContained
+ )
 
-dotnet publish -c Release --runtime win-x64
+
+dotnet publish -c Release --runtime $architecture --self-contained $selfContained
 
 # Remove all folders except wwwroot and en-us
 # Set array of folders to keep
 
 $foldersToKeep = @("wwwroot", "en-us")
 
 # Get all folders in the publish folder
-$folders = Get-ChildItem -Path .\bin\Release\net9.0-windows10.0.19041.0\win-x64\publish -Directory
+$folders = Get-ChildItem -Path .\bin\Release\net9.0-windows10.0.19041.0\$architecture\publish -Directory
 
 # Delete folders that are not in the foldersToKeep array
 foreach ($folder in $folders) {

diff --git a/src/NodeDev.Blazor.MAUI/wwwroot/index.html b/src/NodeDev.Blazor.MAUI/wwwroot/index.html
@@ -13,8 +13,8 @@
 
     <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet" />
 
-    <link href="_content/Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
-    <link href="_content/Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
+    <link href="_content/Snakex64.Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
+    <link href="_content/Snakex64.Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
     <link rel="icon" href="data:,">
 </head>
 
@@ -37,7 +37,7 @@
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
 
-    <script src="_content/Z.Blazor.Diagrams/script.min.js"></script>
+    <script src="_content/Snakex64.Z.Blazor.Diagrams/script.min.js"></script>
 </body>
 
 </html>
diff --git a/src/NodeDev.Blazor.Server/App.razor b/src/NodeDev.Blazor.Server/App.razor
@@ -11,8 +11,8 @@
 
     <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet" />
 
-    <link href="_content/Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
-    <link href="_content/Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
+    <link href="_content/Snakex64.Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
+    <link href="_content/Snakex64.Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
 </head>
 <body style="width: 100vw; height: 100vh">
 
@@ -27,6 +27,6 @@
 
     <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
 
-    <script src="_content/Z.Blazor.Diagrams/script.min.js"></script>
+    <script src="_content/Snakex64.Z.Blazor.Diagrams/script.min.js"></script>
 </body>
 </html>
diff --git a/src/NodeDev.Blazor/NodeDev.Blazor.csproj b/src/NodeDev.Blazor/NodeDev.Blazor.csproj
@@ -12,14 +12,13 @@
 
   <ItemGroup>
     <PackageReference Include="BlazorMonaco" Version="3.2.0" />
-    <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.0-rc.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
-    <PackageReference Include="MudBlazor" Version="7.2.0" />
+    <PackageReference Include="MudBlazor" Version="7.15.0" />
+    <PackageReference Include="Snakex64.Z.Blazor.Diagrams" Version="99.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Blazor.Diagrams\src\Blazor.Diagrams\Blazor.Diagrams.csproj" />
     <ProjectReference Include="..\NodeDev.Core\NodeDev.Core.csproj" />
   </ItemGroup>
 

diff --git a/src/NodeDev.Core/Class/NodeClassTypeCreator.cs b/src/NodeDev.Core/Class/NodeClassTypeCreator.cs
@@ -141,7 +141,7 @@ public void GetBodyAsCsAndMsilCode(string assemblyPath, NodeClassMethod method,
 			str.AppendLine(")");
 			str.AppendLine("{");
 			str.Append(new string(' ', 4));
-			expression.Body.ToCSharpString(str, lineIdent: 4);
+			expression.Body.ToCSharpString(str, indentSpaces: 4);
 			str.AppendLine();
 			str.Append('}');
 

diff --git a/src/NodeDev.Core/NodeDev.Core.csproj b/src/NodeDev.Core/NodeDev.Core.csproj
@@ -8,15 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FastExpressionCompiler" Version="4.2.2" />
+    <PackageReference Include="FastExpressionCompiler" Version="5.0.0" />
     <PackageReference Include="NuGet.Versioning" Version="6.12.1" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
+    <PackageReference Include="snakex64.Dis2Msil" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Dis2Msil\Dis2Msil\Dis2Msil.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Dependencies\System.Reflection.Emit.dll">
     </EmbeddedResource>

diff --git a/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj b/src/NodeDev.EndToEndTests/NodeDev.EndToEndTests.csproj
@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.48.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.49.0" />
     <PackageReference Include="Reqnroll.NUnit" Version="2.2.1" />
     <PackageReference Include="nunit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

diff --git a/src/NodeDev.Tests/NodeDev.Tests.csproj b/src/NodeDev.Tests/NodeDev.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

diff --git a/src/NodeDev.sln b/src/NodeDev.sln
@@ -18,18 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml
+		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Diagrams", "Blazor.Diagrams\src\Blazor.Diagrams\Blazor.Diagrams.csproj", "{2E39F6E8-637A-4EFE-970C-53CA5972BC90}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagrams", "Diagrams", "{1F7402C9-C5FD-481F-95D0-F9646E68CD02}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Diagrams.Core", "Blazor.Diagrams\src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj", "{13919421-1AE3-4B79-8CC9-7C084F74E718}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{F19EB03F-8DAD-4553-B7BA-863B6B2F155F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dis2Msil", "Dis2Msil\Dis2Msil\Dis2Msil.csproj", "{9873F12D-9C5B-4756-B31C-B514664638CE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeDev.EndToEndTests", "NodeDev.EndToEndTests\NodeDev.EndToEndTests.csproj", "{DFA6D765-BFC3-407F-9330-B92B89310DCA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A73FFB19-1791-4E6E-829C-A6B85E1BD8F2} = {A73FFB19-1791-4E6E-829C-A6B85E1BD8F2}
@@ -59,18 +50,6 @@ Global
 		{4C775E47-79BC-4F2D-93FF-440A151B2757}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C775E47-79BC-4F2D-93FF-440A151B2757}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C775E47-79BC-4F2D-93FF-440A151B2757}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E39F6E8-637A-4EFE-970C-53CA5972BC90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E39F6E8-637A-4EFE-970C-53CA5972BC90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E39F6E8-637A-4EFE-970C-53CA5972BC90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E39F6E8-637A-4EFE-970C-53CA5972BC90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13919421-1AE3-4B79-8CC9-7C084F74E718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13919421-1AE3-4B79-8CC9-7C084F74E718}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13919421-1AE3-4B79-8CC9-7C084F74E718}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13919421-1AE3-4B79-8CC9-7C084F74E718}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9873F12D-9C5B-4756-B31C-B514664638CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9873F12D-9C5B-4756-B31C-B514664638CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9873F12D-9C5B-4756-B31C-B514664638CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9873F12D-9C5B-4756-B31C-B514664638CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DFA6D765-BFC3-407F-9330-B92B89310DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DFA6D765-BFC3-407F-9330-B92B89310DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DFA6D765-BFC3-407F-9330-B92B89310DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,12 +61,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2E39F6E8-637A-4EFE-970C-53CA5972BC90} = {1F7402C9-C5FD-481F-95D0-F9646E68CD02}
-		{1F7402C9-C5FD-481F-95D0-F9646E68CD02} = {F19EB03F-8DAD-4553-B7BA-863B6B2F155F}
-		{13919421-1AE3-4B79-8CC9-7C084F74E718} = {F19EB03F-8DAD-4553-B7BA-863B6B2F155F}
-		{9873F12D-9C5B-4756-B31C-B514664638CE} = {1F7402C9-C5FD-481F-95D0-F9646E68CD02}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F82949DF-ABD0-4772-9022-5913ED3C6FB2}
 	EndGlobalSection
+1 −10		.github/workflows/push.yml
+0 −7		Directory.Packages.props
+0 −5		README.md
+8 −8		src/Blazor.Diagrams.Algorithms/Blazor.Diagrams.Algorithms.csproj
+8 −7		src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj
+0 −23		src/Blazor.Diagrams.Core/Models/Base/BaseLinkModel.cs
+13 −12		src/Blazor.Diagrams/Blazor.Diagrams.csproj
+5 −14		src/Blazor.Diagrams/Components/LinkWidget.razor.cs
+0 −1		src/Blazor.Diagrams/Components/Renderers/LinkRenderer.cs
+2 −1		src/Blazor.Diagrams/Components/Renderers/LinkVertexRenderer.cs
+ −		src/Blazor.Diagrams/wwwroot/default.styles.min.css.gz
+ −		src/Blazor.Diagrams/wwwroot/script.min.js.gz
+ −		src/Blazor.Diagrams/wwwroot/style.min.css.gz
+1 −1		src/Directory.Build.props