Skip to content

Commit ef6edb6

Browse files
committed
- aligns dependencies with vipr
1 parent 5a74174 commit ef6edb6

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
3+
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,10 +32,10 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
35-
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
35+
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
3636
</Reference>
3737
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
38+
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
3939
</Reference>
4040
<Reference Include="System" />
4141
<Reference Include="System.Core" />
@@ -66,5 +66,12 @@
6666
</ItemGroup>
6767
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
6868
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
69-
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
69+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
70+
<PropertyGroup>
71+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
72+
</PropertyGroup>
73+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
74+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
75+
</Target>
76+
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
7077
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net461" />
4-
<package id="MSTest.TestFramework" version="1.1.18" targetFramework="net461" />
3+
<package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net472" />
4+
<package id="MSTest.TestFramework" version="1.2.1" targetFramework="net472" />
55
</packages>

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@
4040
<HintPath>..\..\packages\Mono.TextTemplating.1.0.0\lib\Mono.TextTemplating.dll</HintPath>
4141
</Reference>
4242
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>
44-
<Private>True</Private>
43+
<HintPath>..\..\packages\NLog.4.5.7\lib\net45\NLog.dll</HintPath>
4544
</Reference>
4645
<Reference Include="System" />
46+
<Reference Include="System.Configuration" />
4747
<Reference Include="System.Core" />
48+
<Reference Include="System.IO.Compression" />
49+
<Reference Include="System.Runtime.Serialization" />
50+
<Reference Include="System.ServiceModel" />
51+
<Reference Include="System.Transactions" />
4852
<Reference Include="System.Xml.Linq" />
4953
<Reference Include="System.Data.DataSetExtensions" />
5054
<Reference Include="Microsoft.CSharp" />

src/GraphODataTemplateWriter/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Inflector" version="1.0.0.0" targetFramework="net45" />
44
<package id="Mono.TextTemplating" version="1.0.0" targetFramework="net45" />
5-
<package id="NLog" version="4.4.11" targetFramework="net45" />
5+
<package id="NLog" version="4.5.7" targetFramework="net472" />
66
<package id="NLog.Config" version="4.4.11" targetFramework="net45" />
77
<package id="NLog.Schema" version="4.4.11" targetFramework="net45" />
88
</packages>

0 commit comments

Comments
 (0)