Skip to content

Commit 4d6ea92

Browse files
asbjornuasbjornu
committed
Upgrade Microsoft.CodeAnalysis.* from v1.0.0 to v1.2.1 and with that, reintroduce the NuGet dependencies to System.*
1 parent 897925e commit 4d6ea92

File tree

2 files changed

+27
-14
lines changed

2 files changed

+27
-14
lines changed

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
</Reference>
6767
<Reference Include="Microsoft.Build.Framework" />
6868
<Reference Include="Microsoft.Build.Utilities.v4.0" />
69-
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
69+
<Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.2.1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
73+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.2.1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
77+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.1\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="Microsoft.CSharp" />
@@ -117,12 +117,12 @@
117117
</Reference>
118118
<Reference Include="System" />
119119
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
120-
<HintPath>..\packages\System.Collections.Immutable.1.1.37\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
120+
<HintPath>..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
121121
<Private>True</Private>
122122
</Reference>
123123
<Reference Include="System.Core" />
124-
<Reference Include="System.Reflection.Metadata, Version=1.0.22.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125-
<HintPath>..\packages\System.Reflection.Metadata.1.0.22\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
124+
<Reference Include="System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125+
<HintPath>..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
126126
<Private>True</Private>
127127
</Reference>
128128
<Reference Include="System.Xml.Linq" />
@@ -180,7 +180,10 @@
180180
<ItemGroup>
181181
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
182182
</ItemGroup>
183-
<ItemGroup />
183+
<ItemGroup>
184+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
185+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
186+
</ItemGroup>
184187
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
185188
<PropertyGroup>
186189
<PostBuildEvent>

‎src/GitVersionTask.Tests/packages.config

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,25 @@
77
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
88
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
99
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
10-
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net45" />
11-
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net45" />
12-
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net45" />
13-
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" targetFramework="net45" />
10+
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
11+
<package id="Microsoft.CodeAnalysis.Common" version="1.2.1" targetFramework="net45" />
12+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.2.1" targetFramework="net45" />
13+
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.2.1" targetFramework="net45" />
1414
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
1515
<package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
1616
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
1717
<package id="NUnit" version="3.2.1" targetFramework="net45" />
1818
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
1919
<package id="ObjectApproval" version="1.3.0" targetFramework="net45" />
2020
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
21+
<package id="System.Collections" version="4.0.0" targetFramework="net45" />
22+
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net45" />
23+
<package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net45" />
24+
<package id="System.Globalization" version="4.0.0" targetFramework="net45" />
25+
<package id="System.Linq" version="4.0.0" targetFramework="net45" />
26+
<package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net45" />
27+
<package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net45" />
28+
<package id="System.Runtime" version="4.0.0" targetFramework="net45" />
29+
<package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net45" />
30+
<package id="System.Threading" version="4.0.0" targetFramework="net45" />
2131
</packages>

0 commit comments

Comments
 (0)