Merge branch 'develop2'

yar229 · Jul 15, 2022 · 4b03894 · 4b03894
2 parents 1eaf5d2 + 8ec94f4
commit 4b03894
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 12 deletions.
diff --git a/Common.targets b/Common.targets
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 
 		<!--<CommonTargetFrameworks>netcoreapp3.1;net48;net5.0</CommonTargetFrameworks>-->
-    <CommonTargetFrameworks>netcoreapp3.1;net48;net5.0</CommonTargetFrameworks>
+    <CommonTargetFrameworks>netcoreapp3.1;net48;net5.0;net6.0</CommonTargetFrameworks>
 
 		<CommonLangVersion>latest</CommonLangVersion>
 	</PropertyGroup>

diff --git a/Hasher/Hasher.csproj b/Hasher/Hasher.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\Common.targets" />
 
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj b/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 

diff --git a/NWebDav/NWebDav.Server.HttpListener/NWebDav.Server.HttpListener.csproj b/NWebDav/NWebDav.Server.HttpListener/NWebDav.Server.HttpListener.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">

diff --git a/NWebDav/NWebDav.Server/NWebDav.Server.csproj b/NWebDav/NWebDav.Server/NWebDav.Server.csproj
@@ -10,8 +10,12 @@
 		<DefineConstants>$(DefineConstants);USE_XML_ASYNC_READWRITE</DefineConstants>
 	</PropertyGroup>
 
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+		<DefineConstants>$(DefineConstants);USE_XML_ASYNC_READWRITE</DefineConstants>
+	</PropertyGroup>
+
 	<PropertyGroup>
-		<LangVersion>9.0</LangVersion>
+		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" /> 
   </ItemGroup>
 

diff --git a/WebDAV.Uploader/WDMRC.Console.Client.csproj b/WebDAV.Uploader/WDMRC.Console.Client.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WebDAVMailRuCloud.sln b/WebDAVMailRuCloud.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28721.148
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8950FA45-4F13-42FE-B32D-736C1426E0EF}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/WebDavMailRuCloudStore/WebDavStore.csproj b/WebDavMailRuCloudStore/WebDavStore.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="log4net" Version="2.0.14" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,6 +20,7 @@ variables:
   artifactNetFrameworkName: 'WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNet48.zip'
   artifactMonoName: 'WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNet48.zip'
   artifactNet5Name: 'WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNet5.zip'
+  artifactNet6Name: 'WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNet6.zip'
 
 
 steps:
@@ -89,6 +90,22 @@ steps:
 
 #=============================================================================================================
 
+- task: DotNetCoreCLI@2
+  displayName: .NET 6 publish
+  inputs:
+    command: 'publish' 
+    projects: 'WDMRC.Console/WDMRC.Console.csproj'
+    publishWebProjects: false # Required when command == Publish
+    arguments: '--configuration $(BuildConfiguration) --framework net6.0'
+
+- task: Bash@3
+  displayName: .NET 6 copy artifact to WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNet6.zip
+  inputs:
+    targetType: 'inline'
+    script: 'cp WDMRC.Console/bin/Release/net6.0/publish.zip ''$(Build.ArtifactStagingDirectory)''/$(artifactNet6Name)'
+
+#=============================================================================================================
+
 - task: PowerShell@2
   displayName: Making release.info.json artifact
   inputs:
@@ -124,6 +141,12 @@ steps:
             "runner" : "dotnet",
             "file" : "wdmrc.dll",
             "defaultkeys" : ""
+          },
+          "net6" : {
+            "distrib" : "$(artifactNet6Name)",
+            "runner" : "dotnet",
+            "file" : "wdmrc.dll",
+            "defaultkeys" : ""
           }
         }
       }