Merge branch 'develop2'

yar229 · Oct 16, 2019 · ad7598c · ad7598c
2 parents b59f6ae + 1e2ec59
commit ad7598c
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 41 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/Base/Streams/UploadStream.cs b/MailRuCloud/MailRuCloudApi/Base/Streams/UploadStream.cs
@@ -1,6 +1,6 @@
 namespace YaR.MailRuCloud.Api.Base.Streams
 {
-#if NETCOREAPP2_2
+#if NETCOREAPP3_0
 
     internal class UploadStream : UploadStreamHttpClient
     {

diff --git a/MailRuCloud/MailRuCloudApi/MailRuCloudApi.csproj b/MailRuCloud/MailRuCloudApi/MailRuCloudApi.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <RootNamespace>YaR.MailRuCloud.Api</RootNamespace>
     <AssemblyName>MailRuCloud.Api</AssemblyName>
     <AssemblyVersion>1.10.7.13</AssemblyVersion>
     <FileVersion>1.10.7.13</FileVersion>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/MailRuCloud/TwoFA/UI/MailRuCloudApi.TwoFA.Console/MailRuCloudApi.TwoFA.Console.csproj b/MailRuCloud/TwoFA/UI/MailRuCloudApi.TwoFA.Console/MailRuCloudApi.TwoFA.Console.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <RootNamespace>YaR.MailRuCloud.TwoFA.UI</RootNamespace>
     <AssemblyName>MailRuCloud.TwoFA.UI.Console</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/MailRuCloud/TwoFA/UI/MailRuCloudApi.TwoFA.File/MailRuCloudApi.TwoFA.File.csproj b/MailRuCloud/TwoFA/UI/MailRuCloudApi.TwoFA.File/MailRuCloudApi.TwoFA.File.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <RootNamespace>YaR.MailRuCloud.TwoFA.UI</RootNamespace>
     <AssemblyName>MailRuCloud.TwoFA.UI.File</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/NWebDav/NWebDav.Server.HttpListener/NWebDav.Server.HttpListener.csproj b/NWebDav/NWebDav.Server.HttpListener/NWebDav.Server.HttpListener.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/NWebDav/NWebDav.Server/NWebDav.Server.csproj b/NWebDav/NWebDav.Server/NWebDav.Server.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/WDMRC.Console/Properties/PublishProfiles/FolderProfile.pubxml b/WDMRC.Console/Properties/PublishProfiles/FolderProfile.pubxml
diff --git a/WDMRC.Console/Properties/PublishProfiles/FolderProfileLinux.pubxml b/WDMRC.Console/Properties/PublishProfiles/FolderProfileLinux.pubxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>ReleaseBinaries</Configuration>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <PublishDir>bin\Publish\Linux</PublishDir>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <Platform>x64</Platform>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
-    <DefineConstants>TRACE;RELEASE;NETCOREAPP2_2</DefineConstants>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
     <Authors>YaR</Authors>
     <Company />
     <Product>WebDAVCloudMailRu</Product>

diff --git a/WebDAV.Uploader/WDMRC.Console.Client.csproj b/WebDAV.Uploader/WDMRC.Console.Client.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <AssemblyName>mrclient</AssemblyName>
     <RootNamespace>YaR.CloudMailRu.Client.Console</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/WebDavMailRuCloudStore/WebDavMailRuCloudStore.csproj b/WebDavMailRuCloudStore/WebDavMailRuCloudStore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <RootNamespace>YaR.WebDavMailRu.CloudStore</RootNamespace>
     <AssemblyName>MailRuCloud.NWebDav.Store</AssemblyName>
   </PropertyGroup>
@@ -17,7 +17,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/WinServiceInstaller/WinServiceInstaller.csproj b/WinServiceInstaller/WinServiceInstaller.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
     <OutputType>library</OutputType>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
-    <DefineConstants>TRACE;RELEASE;NETCOREAPP2_2</DefineConstants>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
     <PackageId></PackageId>
     <AssemblyVersion>1.10.0.5</AssemblyVersion>
     <FileVersion>1.10.0.5</FileVersion>
@@ -18,7 +18,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.2|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,6 +20,14 @@ variables:
 steps:
 - task: NuGetToolInstaller@0
 
+#- task: UseDotNet@2
+#  displayName: 'Use .NET Core sdk'
+#  inputs:
+#    packageType: sdk
+#    version: 3.x
+#    includePreviewVersions: true
+#    installationPath: $(Agent.ToolsDirectory)/dotnet
+
 #- task: NuGetCommand@2
 #  inputs:
 #    restoreSolution: '$(solution)'
@@ -61,34 +69,34 @@ steps:
     command: 'publish' 
     projects: 'WDMRC.Console/WDMRC.Console.csproj'
     publishWebProjects: false # Required when command == Publish
-    arguments: '--configuration $(BuildConfiguration) --framework netcoreapp2.2'
+    arguments: '--configuration $(BuildConfiguration) --framework netcoreapp3.0'
 
 - task: Bash@3
-  displayName: .NETCore copy artifact to WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore22.zip
+  displayName: .NETCore copy artifact to WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore30.zip
   inputs:
     targetType: 'inline'
-    script: 'cp WDMRC.Console/bin/Release/netcoreapp2.2/publish.zip ''$(Build.ArtifactStagingDirectory)''/WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore22.zip'
+    script: 'cp WDMRC.Console/bin/Release/netcoreapp3.0/publish.zip ''$(Build.ArtifactStagingDirectory)''/WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore30.zip'
 
 #- task: CopyFiles@2
 #  displayName: .NETCore copy artifact
 #  inputs:
-#    SourceFolder: 'WDMRC.Console/bin/Release/netcoreapp2.2/'
+#    SourceFolder: 'WDMRC.Console/bin/Release/netcoreapp3.0/'
 #    Contents: 'publish.zip'
 #    TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
 #- task: Bash@3
 #  displayName: .NETCore artifacts clean
 #  inputs:
 #    targetType: 'inline'
-#    script: 'rm WDMRC.Console/bin/Release/netcoreapp2.2/*.pdb'
+#    script: 'rm WDMRC.Console/bin/Release/netcoreapp3.0/*.pdb'
 
 #- task: ArchiveFiles@2
 #  displayName: .NETCore artifacts archive
 #  inputs:
-#    rootFolderOrFile: 'WDMRC.Console/bin/Release/netcoreapp2.2/'
+#    rootFolderOrFile: 'WDMRC.Console/bin/Release/netcoreapp3.0/'
 #    includeRootFolder: false
 #    archiveType: 'zip'
-#    archiveFile: '$(Build.ArtifactStagingDirectory)/WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore22.zip'
+#    archiveFile: '$(Build.ArtifactStagingDirectory)/WebDAVCloudMailRu-$(Build.SourceBranchName)-dotNetCore30.zip'
 #    replaceExistingArchive: true
 
 #=============================================================================================================