diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 436a02e..a197f79 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,9 +39,12 @@ jobs:
cmake ..\ -A x64 "-DCMAKE_SYSTEM_VERSION=10.0.19041.0"
cmake --build . --config Release
+ - name: Build 7Zap.NET
+ run: |
+ msbuild 7Zap\dirs.proj -restore -p:FullVersion=23.01.${{ github.run_number }}
+
- name: Nuget pack
run: |
- nuget pack 7Zap\Nuget\7Zap.NET.nuspec -Version 23.01.${{ github.run_number }} -BasePath "${{ github.workspace }}" -NonInteractive -Properties "src_root=.;build_x64=build-x64;build_x86=build-x86;build_arm64=build-Arm64;config=Release"
nuget pack 7Zap\Nuget\7Zap.nuspec -Version 23.01.${{ github.run_number }} -BasePath "${{ github.workspace }}" -NonInteractive -Properties "src_root=.;build_x64=build-x64;build_x86=build-x86;build_arm64=build-Arm64;config=Release"
- uses: actions/upload-artifact@v3.1.2
diff --git a/7Zap/7Zap.NET/7Zap.NET.csproj b/7Zap/7Zap.NET/7Zap.NET.csproj
new file mode 100644
index 0000000..02cb87e
--- /dev/null
+++ b/7Zap/7Zap.NET/7Zap.NET.csproj
@@ -0,0 +1,36 @@
+
+
+
+ netstandard2.0
+ SevenZap
+ 7Zap.NET
+ portable
+
+
+
+ true
+ true
+ 7Zap.NET
+ $(FullVersion)
+ 7Zap.NET: dotnet 7z creator
+ Nir Bar
+ N.B- Panel::Software Ltd.
+ ..\..\
+ README.md
+ dotnet assembly that creates or updated 7z archives
+ Copyright ©2011-$([System.DateTime]::Now.ToString("yyyy")) Panel::Software
+ https://github.com/nirbar/7zap
+ https://github.com/nirbar/7zap
+ git
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/7Zap/7Zap.NET/CMakeLists.txt b/7Zap/7Zap.NET/CMakeLists.txt
deleted file mode 100644
index 2b182cf..0000000
--- a/7Zap/7Zap.NET/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required (VERSION 3.23)
-enable_language(CSharp)
-SET(CMAKE_CSharp_FLAGS "/platform:AnyCPU /langversion:8")
-
-file(GLOB_RECURSE cs_files ${CMAKE_CURRENT_SOURCE_DIR} *.cs)
-
-add_executable (7Zap.NET
- ${cs_files})
-
-set_property(TARGET 7Zap.NET
- PROPERTY DOTNET_TARGET_FRAMEWORK netstandard2)
-set_property(TARGET 7Zap.NET
- PROPERTY DOTNET_SDK Microsoft.NET.Sdk)
-set_property(TARGET 7Zap.NET
- PROPERTY VS_PACKAGE_REFERENCES "System")
-add_dependencies(7Zap.NET 7Zap)
diff --git a/7Zap/7Zap.sln b/7Zap/7Zap.sln
new file mode 100644
index 0000000..d34feea
--- /dev/null
+++ b/7Zap/7Zap.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34316.72
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "7Zap.NET", "7Zap.NET\7Zap.NET.csproj", "{050E3992-624A-3CA1-A654-796F47D6961D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{80BB407D-1D60-4D9F-AAF3-248F559D0D82}"
+ ProjectSection(SolutionItems) = preProject
+ ..\.github\workflows\build.yml = ..\.github\workflows\build.yml
+ CMakeLists.txt = CMakeLists.txt
+ Directory.Build.props = Directory.Build.props
+ Directory.Packages.props = Directory.Packages.props
+ dirs.proj = dirs.proj
+ global.json = global.json
+ TidyBuild.custom.props = TidyBuild.custom.props
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {050E3992-624A-3CA1-A654-796F47D6961D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {050E3992-624A-3CA1-A654-796F47D6961D}.Debug|x64.Build.0 = Debug|Any CPU
+ {050E3992-624A-3CA1-A654-796F47D6961D}.Release|x64.ActiveCfg = Release|Any CPU
+ {050E3992-624A-3CA1-A654-796F47D6961D}.Release|x64.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {4A4B384F-319A-33C7-A3F0-4AA77687364E}
+ EndGlobalSection
+EndGlobal
diff --git a/7Zap/CMakeLists.txt b/7Zap/CMakeLists.txt
index 0bd76bd..df62df9 100644
--- a/7Zap/CMakeLists.txt
+++ b/7Zap/CMakeLists.txt
@@ -2,4 +2,3 @@
cmake_policy(SET CMP0091 NEW)
add_subdirectory ("7zap")
-add_subdirectory ("7zap.NET")
diff --git a/7Zap/Directory.Build.props b/7Zap/Directory.Build.props
new file mode 100644
index 0000000..7d98408
--- /dev/null
+++ b/7Zap/Directory.Build.props
@@ -0,0 +1,21 @@
+
+
+
+ Release
+ $(MSBuildThisFileDirectory)..\build\
+ $(BaseBuildFolder)obj\$(MSBuildProjectName)\
+ $(BaseIntermediateOutputPath)
+
+ $(BaseBuildFolder)$(Platform)\
+ $(BuildFolder)bin\$(Configuration)\$(MSBuildProjectName)\
+ $(BuildFolder)lib\$(Configuration)\
+ $(BuildFolder)obj\$(Configuration)\$(MSBuildProjectName)\
+
+ $(OutputPath)
+ $(IntermediateOutputPath)
+ $(OutputPath)
+ $(IntermediateOutputPath)
+
+ PackageReference
+
+
diff --git a/7Zap/Directory.Packages.props b/7Zap/Directory.Packages.props
new file mode 100644
index 0000000..08f4576
--- /dev/null
+++ b/7Zap/Directory.Packages.props
@@ -0,0 +1,9 @@
+
+
+ true
+
+
+
+
+
+
diff --git a/7Zap/Nuget/7Zap.NET.nuspec b/7Zap/Nuget/7Zap.NET.nuspec
deleted file mode 100644
index c96a623..0000000
--- a/7Zap/Nuget/7Zap.NET.nuspec
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 7Zap.NET
- 7Zap.NET: dotnet 7z creator
- 23.01
- dotnet assembly that creates or updated 7z archives
- Nir Bar
-
- https://github.com/nirbar/7zap
- MIT
- README.md
-
-
-
-
-
-
-
-
-
-
-
diff --git a/7Zap/TidyBuild.custom.props b/7Zap/TidyBuild.custom.props
new file mode 100644
index 0000000..4b69f39
--- /dev/null
+++ b/7Zap/TidyBuild.custom.props
@@ -0,0 +1,12 @@
+
+
+
+
+ 23.01
+ $(FullVersion).$(GITHUB_RUN_NUMBER)
+
+ false
+ false
+ false
+
+
diff --git a/7Zap/dirs.proj b/7Zap/dirs.proj
new file mode 100644
index 0000000..108b13b
--- /dev/null
+++ b/7Zap/dirs.proj
@@ -0,0 +1,13 @@
+
+
+ SolutionDir=$(MSBuildThisFileDirectory);BuildProjectReferences=false
+ $(MSBuildThisFileDirectory)Directory.Build.props
+
+
+
+
+
+
+
+
+
diff --git a/7Zap/global.json b/7Zap/global.json
new file mode 100644
index 0000000..81b1e41
--- /dev/null
+++ b/7Zap/global.json
@@ -0,0 +1,9 @@
+{
+ "msbuild-sdks": {
+ "Microsoft.Build.Traversal": "4.0.0"
+ },
+ "sdk": {
+ "version": "6.0.300",
+ "rollForward": "latestMinor"
+ }
+}