Skip to content

Commit a341460

Browse files
baywetbaywet
committed
- switches to dotnet 4.7.2 and fixes references
1 parent be84020 commit a341460

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>GraphODataTemplateWriter.Test</RootNamespace>
1111
<AssemblyName>GraphODataTemplateWriter.Test</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
1919
<TestProjectType>UnitTest</TestProjectType>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
22+
<TargetFrameworkProfile />
2223
</PropertyGroup>
2324
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2425
<DebugSymbols>true</DebugSymbols>
@@ -65,12 +66,5 @@
6566
</ItemGroup>
6667
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
6768
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
68-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
69-
<PropertyGroup>
70-
<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>
71-
</PropertyGroup>
72-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
73-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
74-
</Target>
7569
<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')" />
7670
</Project>

‎Templates/Templates.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{5F526973-F69E-4C26-B8AD-612590A17A9E}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<NoStandardLibraries>false</NoStandardLibraries>
99
<AssemblyName>ClassLibrary</AssemblyName>
10-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1111
<FileAlignment>512</FileAlignment>
12+
<TargetFrameworkProfile />
1213
</PropertyGroup>
1314
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1415
<DebugSymbols>true</DebugSymbols>
@@ -18,6 +19,7 @@
1819
<DefineConstants>DEBUG;TRACE</DefineConstants>
1920
<ErrorReport>prompt</ErrorReport>
2021
<WarningLevel>4</WarningLevel>
22+
<Prefer32Bit>false</Prefer32Bit>
2123
</PropertyGroup>
2224
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2325
<DebugType>pdbonly</DebugType>
@@ -26,6 +28,7 @@
2628
<DefineConstants>TRACE</DefineConstants>
2729
<ErrorReport>prompt</ErrorReport>
2830
<WarningLevel>4</WarningLevel>
31+
<Prefer32Bit>false</Prefer32Bit>
2932
</PropertyGroup>
3033
<PropertyGroup>
3134
<RootNamespace>Templates</RootNamespace>

‎Typewriter.sln

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2005
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30406.217
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6ACF6CEE-A594-4DFE-9286-C7154E91738B}"
7-
ProjectSection(SolutionItems) = preProject
8-
.nuget\NuGet.Config = .nuget\NuGet.Config
9-
.nuget\NuGet.exe = .nuget\NuGet.exe
10-
.nuget\NuGet.targets = .nuget\NuGet.targets
11-
EndProjectSection
12-
EndProject
136
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphODataTemplateWriter", "src\GraphODataTemplateWriter\GraphODataTemplateWriter.csproj", "{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}"
147
EndProject
158
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Templates", "Templates\Templates.csproj", "{5F526973-F69E-4C26-B8AD-612590A17A9E}"
@@ -28,6 +21,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vipr.Reader.OData.v4", "sub
2821
EndProject
2922
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typewriter.Test", "test\Typewriter.Test\Typewriter.Test.csproj", "{4F1B8EF2-EAFD-4DDB-B688-1A134524047B}"
3023
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vipr", "submodules\vipr\src\Core\Vipr\Vipr.csproj", "{D9E57059-BAD6-483B-985C-C7D1DA24ED7F}"
25+
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataReader.v4UnitTests", "submodules\vipr\test\ODataReader.v4UnitTests\ODataReader.v4UnitTests.csproj", "{0FE50B4D-1BB1-4CE5-91EA-D5046F326536}"
27+
EndProject
3128
Global
3229
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3330
Debug|Any CPU = Debug|Any CPU
@@ -60,6 +57,14 @@ Global
6057
{4F1B8EF2-EAFD-4DDB-B688-1A134524047B}.Debug|Any CPU.Build.0 = Debug|Any CPU
6158
{4F1B8EF2-EAFD-4DDB-B688-1A134524047B}.Release|Any CPU.ActiveCfg = Release|Any CPU
6259
{4F1B8EF2-EAFD-4DDB-B688-1A134524047B}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{D9E57059-BAD6-483B-985C-C7D1DA24ED7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61+
{D9E57059-BAD6-483B-985C-C7D1DA24ED7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
62+
{D9E57059-BAD6-483B-985C-C7D1DA24ED7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{D9E57059-BAD6-483B-985C-C7D1DA24ED7F}.Release|Any CPU.Build.0 = Release|Any CPU
64+
{0FE50B4D-1BB1-4CE5-91EA-D5046F326536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65+
{0FE50B4D-1BB1-4CE5-91EA-D5046F326536}.Debug|Any CPU.Build.0 = Debug|Any CPU
66+
{0FE50B4D-1BB1-4CE5-91EA-D5046F326536}.Release|Any CPU.ActiveCfg = Release|Any CPU
67+
{0FE50B4D-1BB1-4CE5-91EA-D5046F326536}.Release|Any CPU.Build.0 = Release|Any CPU
6368
EndGlobalSection
6469
GlobalSection(SolutionProperties) = preSolution
6570
HideSolutionNode = FALSE

‎src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Microsoft.Graph.ODataTemplateWriter</RootNamespace>
1111
<AssemblyName>GraphODataTemplateWriter</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -142,6 +143,14 @@
142143
<Project>{04c24936-006a-4fd8-a872-ee55588c1cbe}</Project>
143144
<Name>Vipr.Core</Name>
144145
</ProjectReference>
146+
<ProjectReference Include="..\..\submodules\vipr\src\Core\Vipr\Vipr.csproj">
147+
<Project>{d9e57059-bad6-483b-985c-c7d1da24ed7f}</Project>
148+
<Name>Vipr</Name>
149+
</ProjectReference>
150+
<ProjectReference Include="..\..\submodules\vipr\src\Readers\Vipr.Reader.OData.v4\Vipr.Reader.OData.v4.csproj">
151+
<Project>{6d8d8008-0a34-490f-8b38-21d9c8bf25c0}</Project>
152+
<Name>Vipr.Reader.OData.v4</Name>
153+
</ProjectReference>
145154
</ItemGroup>
146155
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
147156
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎test/Typewriter.Test/Typewriter.Test.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,5 @@
7878
</ItemGroup>
7979
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
8080
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
81-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
82-
<PropertyGroup>
83-
<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>
84-
</PropertyGroup>
85-
<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'))" />
86-
<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'))" />
87-
</Target>
8881
<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')" />
8982
</Project>

0 commit comments

Comments
 (0)