motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move all submodules to external directory (#18431)

Browse Source 
* Move DataGrid submodule

* Move Numerge submodule

* Move XamlX submodule

* Remove DataGrid from slnf file.

* Git clean
This commit is contained in:
Julien Lebosquain
2025-03-13 18:51:40 +01:00
committed by GitHub
parent c3b4d61b8a
commit c925ca5c63
13 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+6 -6
View File
@@ -1,9 +1,9 @@
[submodule "nukebuild/Numerge"]
path = nukebuild/Numerge
[submodule "Numerge"]
path = external/Numerge
url = https://github.com/kekekeks/Numerge.git
[submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
[submodule "XamlX"]
path = external/XamlX
url = https://github.com/kekekeks/XamlX.git
[submodule "src/Avalonia.Controls.DataGrid"]
path = src/Avalonia.Controls.DataGrid
[submodule "Avalonia.Controls.DataGrid"]
path = external/Avalonia.Controls.DataGrid
url = https://github.com/AvaloniaUI/Avalonia.Controls.DataGrid.git
Avalonia.Desktop.slnf
+1 -3
View File
@@ -19,7 +19,6 @@
"src\\Avalonia.Base\\Avalonia.Base.csproj",
"src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj",
"src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj",
"src\\Avalonia.Controls.DataGrid\\Avalonia.Controls.DataGrid.csproj",
"src\\Avalonia.Controls\\Avalonia.Controls.csproj",
"src\\Avalonia.DesignerSupport\\Avalonia.DesignerSupport.csproj",
"src\\Avalonia.Desktop\\Avalonia.Desktop.csproj",
@@ -55,7 +54,6 @@
"tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj",
"tests\\Avalonia.Benchmarks\\Avalonia.Benchmarks.csproj",
"tests\\Avalonia.Build.Tasks.UnitTest\\Avalonia.Build.Tasks.UnitTest.csproj",
"tests\\Avalonia.Controls.DataGrid.UnitTests\\Avalonia.Controls.DataGrid.UnitTests.csproj",
"tests\\Avalonia.Controls.UnitTests\\Avalonia.Controls.UnitTests.csproj",
"tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj",
"tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj",
@@ -74,4 +72,4 @@
"tests\\TestFiles\\BuildTasks\\PInvoke\\PInvoke.csproj"
]
}
}
}
azure-pipelines-integrationtests.yml
+1
View File
@@ -24,6 +24,7 @@ jobs:
if [[ $(uname -m) == 'arm64' ]]; then
arch="arm64"
fi
git clean -ffdx
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
pkill node
pkill testmanagerd
dirs.proj
-1
View File
@@ -7,7 +7,6 @@
<ProjectReference Condition="'$(SkipBuildingTests)' != 'True'" Include="tests/**/*.*proj" Exclude="tests/BuildTests/**" />
<ProjectReference Include="packages/**/*.*proj" />
<ProjectReference Remove="**/*.shproj" />
<ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/*.*proj" />
<!-- Exclude iOS, Android and Browser samples from build -->
<ProjectReference Remove="samples/*.iOS/*.csproj" />
<ProjectReference Remove="samples/*.Android/*.csproj" />
src/Avalonia.Controls.DataGrid → external/Avalonia.Controls.DataGrid
Vendored
View File
nukebuild/Numerge → external/Numerge
Vendored
View File
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github → external/XamlX
Vendored
View File
nukebuild/Build.cs
-1
View File
@@ -245,7 +245,6 @@ partial class Build : NukeBuild
{
RunCoreTest("Avalonia.Base.UnitTests");
RunCoreTest("Avalonia.Controls.UnitTests");
RunCoreTest("Avalonia.Controls.DataGrid.UnitTests");
RunCoreTest("Avalonia.Markup.UnitTests");
RunCoreTest("Avalonia.Markup.Xaml.UnitTests");
RunCoreTest("Avalonia.Skia.UnitTests");
nukebuild/_build.csproj
+3 -2
View File
@@ -36,8 +36,9 @@
<NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
<!-- Common build related files -->
<Compile Remove="Numerge/**/*.*" />
<Compile Include="Numerge/Numerge/**/*.cs" Exclude="Numerge/Numerge/obj/**/*.cs" />
<Compile Include="../external/Numerge/Numerge/**/*.cs"
Exclude="../external/Numerge/Numerge/obj/**/*.cs"
LinkBase="Numerge" />
<EmbeddedResource Include="../build/avalonia.snk" />
</ItemGroup>
src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+8 -10
View File
@@ -9,6 +9,8 @@
<NoWarn>$(NoWarn);NU1605;CS8632</NoWarn>
<DebugType>embedded</DebugType>
<IncludeSymbols>false</IncludeSymbols>
<XamlXSourcePath>../../external/XamlX/src/XamlX</XamlXSourcePath>
<XamlXCecilSourcePath>../../external/XamlX/src/XamlX.IL.Cecil</XamlXCecilSourcePath>
</PropertyGroup>
<!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
@@ -32,13 +34,12 @@
<Compile Include="../Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/**/*.cs">
<Link>XamlIlExtensions/%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Remove="external/cecil/**/*.*" />
<Compile Include="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github\src\XamlX\**\*.cs">
<Link>XamlIl/%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Include="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX.IL.Cecil\**\*.cs">
<Link>XamlIl.Cecil/%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Include="$(XamlXSourcePath)/**/*.cs"
Exclude="$(XamlXSourcePath)/obj/**/*.cs;$(XamlXSourcePath)/Compatibility/*.cs;$(XamlXSourcePath)/**/SreTypeSystem.cs"
LinkBase="XamlIl" />
<Compile Include="$(XamlXCecilSourcePath)/**/*.cs"
Exclude="$(XamlXCecilSourcePath)/obj/**/*.cs"
LinkBase="XamlIl.Cecil" />
<Compile Include="../Markup/Avalonia.Markup\Markup\Parsers\SelectorGrammar.cs">
<Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
@@ -123,9 +124,6 @@
<Compile Include="../Avalonia.Base/Utilities/SpanHelpers.cs" Link="Utilities/SpanHelpers.cs" />
<Compile Include="../Shared/StringCompatibilityExtensions.cs" Link="Compatibility/StringCompatibilityExtensions.cs" />
<Compile Include="../Shared/IsExternalInit.cs" Link="Compatibility/IsExternalInit.cs" />
<Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/obj/**/*.cs" />
<Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/Compatibility/*.cs" />
<Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/IL/SreTypeSystem.cs" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+2 -2
View File
@@ -9,9 +9,9 @@
<ItemGroup>
<Compile Update="**/*.xaml.cs"
DependentUpon="%(Filename)" />
<Compile Include="../Avalonia.Controls.DataGrid/src/Avalonia.Controls.DataGrid/**/*.cs"
<Compile Include="../../external/Avalonia.Controls.DataGrid/src/Avalonia.Controls.DataGrid/**/*.cs"
LinkBase="Diagnostics/Controls/DataGrid" />
<AvaloniaXaml Include="../Avalonia.Controls.DataGrid/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml"
<AvaloniaXaml Include="../../external/Avalonia.Controls.DataGrid/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml"
Link="Diagnostics/Controls/DataGrid/Themes/Simple.xaml" />
</ItemGroup>
src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
+3 -6
View File
@@ -2,15 +2,12 @@
<!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
<PropertyGroup>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<XamlXSourcePath>$(MSBuildThisFileDirectory)/../../../external/XamlX/src/XamlX</XamlXSourcePath>
</PropertyGroup>
<ItemGroup>
<None Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
<Content Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
<Compile Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
<Compile Include="$(MSBuildThisFileDirectory)\xamlil.github\src\XamlX\**\*.cs" />
<Compile Remove="$(MSBuildThisFileDirectory)\xamlil.github\src\XamlX\Compatibility\*.cs" />
<Compile Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\obj\**\*.cs" />
<Compile Include="$(XamlXSourcePath)/**/*.cs"
Exclude="$(XamlXSourcePath)/obj/**/*.cs;$(XamlXSourcePath)/Compatibility/*.cs" />
</ItemGroup>
<ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')))">
src/tools/Avalonia.Generators/Avalonia.Generators.csproj
+4 -3
View File
@@ -9,6 +9,7 @@
<IsRoslynComponent>true</IsRoslynComponent>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<Nullable>enable</Nullable>
<XamlXSourcePath>../../../external/XamlX/src/XamlX</XamlXSourcePath>
</PropertyGroup>
<ItemGroup>
@@ -17,9 +18,9 @@
</ItemGroup>
<ItemGroup>
<Compile Link="Compiler/XamlX/filename" Include="../../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/**/*.cs" />
<Compile Remove="../../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/obj/**/*.cs" />
<Compile Remove="../../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/**/SreTypeSystem.cs" />
<Compile Include="$(XamlXSourcePath)/**/*.cs"
Exclude="$(XamlXSourcePath)/obj/**/*.cs;$(XamlXSourcePath)/IL/SreTypeSystem.cs"
LinkBase="Compiler/XamlX" />
<Compile Include="../../Shared/IsExternalInit.cs" Link="IsExternalInit.cs" Visible="False" />
<Compile Include="../../Avalonia.Base/Compatibility/TrimmingAttributes.cs" Link="TrimmingAttributes.cs" Visible="False" />
<Compile Include="../../Avalonia.Base/Compatibility/NullableAttributes.cs" Link="TrimmingAttributes.cs" Visible="False" />