Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
yar229 committed Nov 18, 2020
1 parent 291114a commit cc291f9
Show file tree
Hide file tree
Showing 12 changed files with 253 additions and 248 deletions.
39 changes: 19 additions & 20 deletions Hasher/Hasher.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
<DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
<Authors>YaR</Authors>
<Company />
<Product>WebDAVCloudMailRu</Product>
<Copyright>[email protected]</Copyright>
<Description>Hash calculator</Description>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<OutputType>Exe</OutputType>
<DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
<Authors>YaR</Authors>
<Company />
<Product>WebDAVCloudMailRu</Product>
<Copyright>[email protected]</Copyright>
<Description>Hash calculator</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MailRuCloud\MailRuCloudApi\YaR.Clouds.csproj" />
<ProjectReference Include="..\WebDavMailRuCloudStore\WebDavStore.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MailRuCloud\MailRuCloudApi\YaR.Clouds.csproj" />
<ProjectReference Include="..\WebDavMailRuCloudStore\WebDavStore.csproj" />
</ItemGroup>

</Project>
</Project>
52 changes: 26 additions & 26 deletions MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
<RootNamespace>YaR.Clouds</RootNamespace>
<AssemblyName>YaR.Clouds</AssemblyName>
<AssemblyVersion>1.13.0.2</AssemblyVersion>
<FileVersion>1.13.0.2</FileVersion>
<Version>$(AssemblyVersion)</Version>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<RootNamespace>YaR.Clouds</RootNamespace>
<AssemblyName>YaR.Clouds</AssemblyName>
<AssemblyVersion>1.13.0.4</AssemblyVersion>
<FileVersion>1.13.0.4</FileVersion>
<Version>$(AssemblyVersion)</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Content Include="XTSSharp\readme.txt" />
</ItemGroup>

<ItemGroup>
<Content Include="XTSSharp\readme.txt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
<RootNamespace>YaR.Clouds.MailRuCloud.TwoFA.UI</RootNamespace>
<AssemblyName>MailRuCloud.TwoFA.UI.Console</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<RootNamespace>YaR.Clouds.MailRuCloud.TwoFA.UI</RootNamespace>
<AssemblyName>MailRuCloud.TwoFA.UI.Console</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\MailRuCloudApi\YaR.Clouds.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\MailRuCloudApi\YaR.Clouds.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
<RootNamespace>YaR.Clouds.MailRuCloud.TwoFA.UI</RootNamespace>
<AssemblyName>MailRuCloud.TwoFA.UI.File</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<RootNamespace>YaR.Clouds.MailRuCloud.TwoFA.UI</RootNamespace>
<AssemblyName>MailRuCloud.TwoFA.UI.File</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\MailRuCloudApi\YaR.Clouds.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\MailRuCloudApi\YaR.Clouds.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<PropertyGroup>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NWebDav.Server\NWebDav.Server.csproj" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>

</Project>
<ItemGroup>
<ProjectReference Include="..\NWebDav.Server\NWebDav.Server.csproj" />
</ItemGroup>

</Project>
24 changes: 15 additions & 9 deletions NWebDav/NWebDav.Server/NWebDav.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<PropertyGroup>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>

</Project>
<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" />
</ItemGroup>

</Project>
113 changes: 56 additions & 57 deletions WDMRC.Console/WDMRC.Console.csproj
Original file line number Diff line number Diff line change
@@ -1,59 +1,58 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(SolutionDir)\Solution.props" />

<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<OutputType>Exe</OutputType>
<DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
<Authors>YaR</Authors>
<Company />
<Product>WebDAVCloudMailRu</Product>
<Copyright>[email protected]</Copyright>
<Description>WebDAV emulator for Cloud.mail.ru</Description>
<PackageId>WebDAVCloudMailRu</PackageId>
<AssemblyVersion>1.13.0.4</AssemblyVersion>
<FileVersion>1.13.0.4</FileVersion>
<Version>$(AssemblyVersion)</Version>
<AssemblyName>wdmrc</AssemblyName>
<RootNamespace>YaR.Clouds.Console</RootNamespace>
<StartupObject></StartupObject>
<ApplicationIcon>cloud.ico</ApplicationIcon>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>


<ItemGroup>
<Content Include="cloud.ico" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Hasher\Hasher.csproj" />
<ProjectReference Include="..\MailRuCloud\MailRuCloudApi\YaR.Clouds.csproj" />
<ProjectReference Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.Console\MailRuCloudApi.TwoFA.Console.csproj" />
<ProjectReference Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.File\MailRuCloudApi.TwoFA.File.csproj" />
<ProjectReference Condition="'$(TargetFramework)' == 'net48'" Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.Dialog\MailRuCloudApi.TwoFA.Dialog.csproj" />
<ProjectReference Include="..\NWebDav\NWebDav.Server.HttpListener\NWebDav.Server.HttpListener.csproj" />
<ProjectReference Include="..\NWebDav\NWebDav.Server\NWebDav.Server.csproj" />
<ProjectReference Include="..\WebDAV.Uploader\WDMRC.Console.Client.csproj" />
<ProjectReference Include="..\WebDavMailRuCloudStore\WebDavStore.csproj" />
<ProjectReference Include="..\WinServiceInstaller\WinServiceInstaller.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="wdmrc.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
<PropertyGroup>
<NoWarn>$(NoWarn);NU1605</NoWarn>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
<DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
<Authors>YaR</Authors>
<Company />
<Product>WebDAVCloudMailRu</Product>
<Copyright>[email protected]</Copyright>
<Description>WebDAV emulator for Cloud.mail.ru</Description>
<PackageId>WebDAVCloudMailRu</PackageId>
<AssemblyVersion>1.13.0.2</AssemblyVersion>
<FileVersion>1.13.0.2</FileVersion>
<Version>$(AssemblyVersion)</Version>
<AssemblyName>wdmrc</AssemblyName>
<RootNamespace>YaR.Clouds.Console</RootNamespace>
<StartupObject></StartupObject>
<ApplicationIcon>cloud.ico</ApplicationIcon>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>


<ItemGroup>
<Content Include="cloud.ico" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Hasher\Hasher.csproj" />
<ProjectReference Include="..\MailRuCloud\MailRuCloudApi\YaR.Clouds.csproj" />
<ProjectReference Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.Console\MailRuCloudApi.TwoFA.Console.csproj" />
<ProjectReference Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.File\MailRuCloudApi.TwoFA.File.csproj" />
<ProjectReference Condition="'$(TargetFramework)' == 'NET48'" Include="..\MailRuCloud\TwoFA\UI\MailRuCloudApi.TwoFA.Dialog\MailRuCloudApi.TwoFA.Dialog.csproj" />
<ProjectReference Include="..\NWebDav\NWebDav.Server.HttpListener\NWebDav.Server.HttpListener.csproj" />
<ProjectReference Include="..\NWebDav\NWebDav.Server\NWebDav.Server.csproj" />
<ProjectReference Include="..\WebDAV.Uploader\WDMRC.Console.Client.csproj" />
<ProjectReference Include="..\WebDavMailRuCloudStore\WebDavStore.csproj" />
<ProjectReference Include="..\WinServiceInstaller\WinServiceInstaller.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="wdmrc.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
Loading

0 comments on commit cc291f9

Please sign in to comment.