Skip to content

Commit

Permalink
Latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mstama committed Jun 7, 2017
1 parent dc30185 commit f20d34d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Merchant/obj/Merchant.csproj.nuget.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Marcos\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.0.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.2.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
Expand Down
6 changes: 2 additions & 4 deletions Merchant/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -7050,9 +7050,6 @@
"originalTargetFrameworks": [
"netcoreapp1.1"
],
"files": {
"lib/netcoreapp1.1/Merchant.dll": "C:\\code\\Challenge\\Merchant\\Merchant\\bin\\placeholder\\netcoreapp1.1\\Merchant.dll"
},
"frameworks": {
"netcoreapp1.1": {
"projectReferences": {}
Expand All @@ -7064,7 +7061,8 @@
"dependencies": {
"Microsoft.NETCore.App": {
"target": "Package",
"version": "1.1.2"
"version": "1.1.2",
"autoReferenced": true
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/obj/UnitTests.csproj.nuget.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Marcos\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.0.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.2.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
Expand Down
22 changes: 7 additions & 15 deletions UnitTests/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2925,12 +2925,6 @@
"framework": ".NETCoreApp,Version=v1.1",
"dependencies": {
"Microsoft.NETCore.App": "1.1.2"
},
"compile": {
"bin/placeholder/netcoreapp1.1/Merchant.dll": {}
},
"runtime": {
"bin/placeholder/netcoreapp1.1/Merchant.dll": {}
}
}
}
Expand Down Expand Up @@ -8552,9 +8546,6 @@
"originalTargetFrameworks": [
"netcoreapp1.1"
],
"files": {
"lib/netcoreapp1.1/UnitTests.dll": "C:\\code\\Challenge\\Merchant\\UnitTests\\bin\\placeholder\\netcoreapp1.1\\UnitTests.dll"
},
"frameworks": {
"netcoreapp1.1": {
"projectReferences": {
Expand All @@ -8568,21 +8559,22 @@
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"xunit.runner.visualstudio": {
"target": "Package",
"version": "1.1.2"
"version": "2.2.0"
},
"Microsoft.NET.Test.Sdk": {
"Microsoft.NETCore.App": {
"target": "Package",
"version": "15.0.0"
"version": "1.1.2",
"autoReferenced": true
},
"xunit": {
"target": "Package",
"version": "2.2.0"
},
"xunit.runner.visualstudio": {
"Microsoft.NET.Test.Sdk": {
"target": "Package",
"version": "2.2.0"
"version": "15.0.0"
}
}
}
Expand Down

0 comments on commit f20d34d

Please sign in to comment.