This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/master by this push:
new 974db69cd Moved .msbuildproj files into a new /proj folder so the
distribution can exclude /websites and /.github without Lucene.Net.sln missing
dependencies (#1012)
974db69cd is described below
commit 974db69cd5b07c2a19fcfa224c5102d4fb0c5a4b
Author: Shad Storhaug <[email protected]>
AuthorDate: Wed Nov 6 21:47:30 2024 +0700
Moved .msbuildproj files into a new /proj folder so the distribution can
exclude /websites and /.github without Lucene.Net.sln missing dependencies
(#1012)
---
.build/build.msbuildproj | 10 ----------
Lucene.Net.sln | 11 +++--------
proj/build.msbuildproj | 14 ++++++++++++++
{.github => proj}/github.msbuildproj | 2 +-
{websites => proj}/websites.msbuildproj | 2 +-
5 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/.build/build.msbuildproj b/.build/build.msbuildproj
deleted file mode 100644
index 2cdfee965..000000000
--- a/.build/build.msbuildproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
- <PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
- <OutputPath>bin\</OutputPath>
- </PropertyGroup>
- <ItemGroup>
- <None Include="**/*.*" Exclude="obj/**/*;bin/**/*;*.msbuildproj"/>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index 1561cf9d9..2002610c9 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -43,7 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution
Items", "Solution
NOTICE.txt = NOTICE.txt
NuGet.config = NuGet.config
README.md = README.md
- TestTargetFramework.props = TestTargetFramework.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net",
"src\Lucene.Net\Lucene.Net.csproj", "{3A0AA37E-2B7B-4416-B528-DA4E0E6A6706}"
@@ -197,13 +196,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") =
"docs", "docs", "{42599646-2
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneDocsPlugins",
"src\docs\LuceneDocsPlugins\LuceneDocsPlugins.csproj",
"{FED4A824-1F32-4948-8D37-2B7610804DB5}"
EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "websites",
"websites\websites.msbuildproj", "{C0448DD3-68D2-485F-B31A-D2806E589FA7}"
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "websites",
"proj\websites.msbuildproj", "{C0448DD3-68D2-485F-B31A-D2806E589FA7}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build",
"{9D88BB9B-A226-4C6F-BC99-7AB2D923EDCA}"
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "build",
"proj\build.msbuildproj", "{5C5253E9-BAF2-493C-B4D4-EE01D2E1769F}"
EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "build",
".build\build.msbuildproj", "{5C5253E9-BAF2-493C-B4D4-EE01D2E1769F}"
-EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "github",
".github\github.msbuildproj", "{E71152A0-48CC-4334-981F-F5FBFFA50891}"
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "github",
"proj\github.msbuildproj", "{E71152A0-48CC-4334-981F-F5FBFFA50891}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -509,8 +506,6 @@ Global
{4D0ED7D9-ABEE-4890-B06C-477E3A32B9A0} =
{E5E8C5DC-7048-4818-B884-FB2D037D2EF2}
{FED4A824-1F32-4948-8D37-2B7610804DB5} =
{42599646-275F-4970-BC60-A3349F6498CC}
{C0448DD3-68D2-485F-B31A-D2806E589FA7} =
{42599646-275F-4970-BC60-A3349F6498CC}
- {5C5253E9-BAF2-493C-B4D4-EE01D2E1769F} =
{9D88BB9B-A226-4C6F-BC99-7AB2D923EDCA}
- {E71152A0-48CC-4334-981F-F5FBFFA50891} =
{9D88BB9B-A226-4C6F-BC99-7AB2D923EDCA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F2179CC-CFD2-4419-AB74-D72856931F36}
diff --git a/proj/build.msbuildproj b/proj/build.msbuildproj
new file mode 100644
index 000000000..ecaf1acb5
--- /dev/null
+++ b/proj/build.msbuildproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <OutputPath>bin\</OutputPath>
+ </PropertyGroup>
+ <ItemGroup>
+ <None Include="../.build/**/*.*"
Exclude="../.build/obj/**/*;../.build/bin/**/*;../.build/psake/**/*" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\azure-pipelines.yml" Link="azure-pipelines.yml" />
+ <None Include="..\TestTargetFramework.props"
Link="TestTargetFramework.props" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/.github/github.msbuildproj b/proj/github.msbuildproj
similarity index 73%
rename from .github/github.msbuildproj
rename to proj/github.msbuildproj
index 2cdfee965..eb0cb4909 100644
--- a/.github/github.msbuildproj
+++ b/proj/github.msbuildproj
@@ -5,6 +5,6 @@
<OutputPath>bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
- <None Include="**/*.*" Exclude="obj/**/*;bin/**/*;*.msbuildproj"/>
+ <None Include="../.github/**/*.*"
Exclude="../.github/obj/**/*;../.github/bin/**/*"/>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/websites/websites.msbuildproj b/proj/websites.msbuildproj
similarity index 72%
rename from websites/websites.msbuildproj
rename to proj/websites.msbuildproj
index 884f787f0..d455f28b3 100644
--- a/websites/websites.msbuildproj
+++ b/proj/websites.msbuildproj
@@ -5,6 +5,6 @@
<OutputPath>bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
- <None Include="**/*.*" Exclude="obj/**/*;bin/**/*;*.msbuildproj"/>
+ <None Include="../websites/**/*.*"
Exclude="../websites/obj/**/*;../websites/bin/**/*"/>
</ItemGroup>
</Project>
\ No newline at end of file
