Skip to content

Commit

Permalink
Merge pull request #15 from guibranco/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
guibranco authored Apr 24, 2020
2 parents b446a0a + 33ba377 commit b3b72d5
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 10 deletions.
5 changes: 3 additions & 2 deletions Src/VTEX.API/VTEX.API.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CrispyWaffle" Version="1.2.5" />
<PackageReference Include="CrispyWaffle" Version="1.2.57" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions Src/VTEX.Core/VTEX.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CrispyWaffle" Version="1.2.5" />
<PackageReference Include="CrispyWaffle" Version="1.2.57" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions Src/VTEX.Health/VTEX.Health.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CrispyWaffle" Version="1.2.5" />
<PackageReference Include="CrispyWaffle" Version="1.2.57" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
Expand Down
5 changes: 3 additions & 2 deletions Src/VTEX/VTEX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<ProjectGuid>D1E5B509-0934-4E15-B78D-D3A88AC8CB16</ProjectGuid>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Guilherme Branco Stracini</Authors>
<Copyright>© 2020 Guilherme Branco Stracini. All rights reserved.</Copyright>
Expand All @@ -16,12 +16,13 @@
<Version>1.0.0</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="CrispyWaffle" Version="1.2.5" />
<PackageReference Include="CrispyWaffle" Version="1.2.57" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Src/VTEX/VTEX.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
5 changes: 3 additions & 2 deletions Tests/VTEX.Tests/VTEX.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<ProjectGuid>2FD2F4CE-DCAB-4F78-8A20-A22CD7F74CFB</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.8.0">
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down

0 comments on commit b3b72d5

Please sign in to comment.