Skip to content

Commit abaa384

Browse files
SimonCroppSimonCropp
committed
update roslyn
1 parent 8c7954a commit abaa384

File tree

4 files changed

+51
-18
lines changed

4 files changed

+51
-18
lines changed

‎GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using System.Runtime.CompilerServices;
55
using ApprovalTests;
66
using GitVersion;
7+
using Microsoft.CodeAnalysis;
8+
using Microsoft.CodeAnalysis.CSharp;
79
using NUnit.Framework;
8-
using Roslyn.Compilers;
9-
using Roslyn.Compilers.CSharp;
1010

1111
[TestFixture]
1212
public class AssemblyInfoBuilderTests
@@ -34,11 +34,15 @@ public void VerifyCreatedCode()
3434
};
3535
var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new Config());
3636
Approvals.Verify(assemblyInfoText);
37-
var syntaxTree = SyntaxTree.ParseText(assemblyInfoText);
38-
var references = new[] {new MetadataFileReference(typeof(object).Assembly.Location)};
39-
var compilation = Compilation.Create("Greeter.dll", new CompilationOptions(OutputKind.NetModule), new[] { syntaxTree }, references);
37+
38+
var compilation = CSharpCompilation.Create("Fake.dll")
39+
.WithOptions(new CSharpCompilationOptions(OutputKind.NetModule))
40+
.AddReferences(MetadataReference.CreateFromFile(typeof(object).Assembly.Location))
41+
.AddSyntaxTrees(CSharpSyntaxTree.ParseText(assemblyInfoText));
42+
43+
4044
var emitResult = compilation.Emit(new MemoryStream());
41-
Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Info)));
45+
Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
4246
}
4347

4448
[Test]
@@ -90,10 +94,13 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
9094

9195
var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new Config { AssemblyVersioningScheme = avs });
9296
Approvals.Verify(assemblyInfoText);
93-
var syntaxTree = SyntaxTree.ParseText(assemblyInfoText);
94-
var references = new[] { new MetadataFileReference(typeof(object).Assembly.Location)};
95-
var compilation = Compilation.Create("Greeter.dll", new CompilationOptions(OutputKind.NetModule), new[] { syntaxTree }, references);
97+
98+
var compilation = CSharpCompilation.Create("Fake.dll")
99+
.WithOptions(new CSharpCompilationOptions(OutputKind.NetModule))
100+
.AddReferences(MetadataReference.CreateFromFile(typeof(object).Assembly.Location))
101+
.AddSyntaxTrees(CSharpSyntaxTree.ParseText(assemblyInfoText));
102+
96103
var emitResult = compilation.Emit(new MemoryStream());
97-
Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Info)));
104+
Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
98105
}
99106
}

‎GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Build.Framework" />
5555
<Reference Include="Microsoft.Build.Utilities.v4.0" />
56+
<Reference Include="Microsoft.CodeAnalysis">
57+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.CodeAnalysis.CSharp">
60+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
61+
</Reference>
62+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
63+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Microsoft.CodeAnalysis.Desktop">
66+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
67+
</Reference>
5668
<Reference Include="Microsoft.CSharp" />
5769
<Reference Include="Microsoft.Web.XmlTransform">
5870
<HintPath>..\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -65,18 +77,18 @@
6577
<SpecificVersion>False</SpecificVersion>
6678
<HintPath>..\packages\ObjectApproval.0.2.1\Lib\NET40\ObjectApproval.dll</HintPath>
6779
</Reference>
68-
<Reference Include="Roslyn.Compilers">
69-
<HintPath>..\packages\Roslyn.Compilers.Common.1.2.20906.2\lib\net45\Roslyn.Compilers.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Roslyn.Compilers.CSharp">
72-
<HintPath>..\packages\Roslyn.Compilers.CSharp.1.2.20906.2\lib\net45\Roslyn.Compilers.CSharp.dll</HintPath>
73-
</Reference>
7480
<Reference Include="Shouldly, Version=2.3.1.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
7581
<SpecificVersion>False</SpecificVersion>
7682
<HintPath>..\packages\Shouldly.2.3.1\lib\net40\Shouldly.dll</HintPath>
7783
</Reference>
7884
<Reference Include="System" />
85+
<Reference Include="System.Collections.Immutable">
86+
<HintPath>..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
87+
</Reference>
7988
<Reference Include="System.Core" />
89+
<Reference Include="System.Reflection.Metadata">
90+
<HintPath>..\packages\System.Reflection.Metadata.1.0.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
91+
</Reference>
8092
<Reference Include="System.Xml.Linq" />
8193
<Reference Include="System.Data.DataSetExtensions" />
8294
<Reference Include="System.Data" />
@@ -130,6 +142,7 @@
130142
<Compile Include="BranchFinders\ReleaseTests.cs" />
131143
</ItemGroup>
132144
<ItemGroup>
145+
<None Include="app.config" />
133146
<None Include="packages.config">
134147
<SubType>Designer</SubType>
135148
</None>

‎GitVersionTask.Tests/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.6.4.14350" newVersion="2.6.4.14350" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎GitVersionTask.Tests/packages.config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
66
<package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
8+
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
9+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
810
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net40" />
911
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" developmentDependency="true" />
1012
<package id="NUnit" version="2.6.4" targetFramework="net45" />
1113
<package id="ObjectApproval" version="0.2.1" targetFramework="net45" />
12-
<package id="Roslyn.Compilers.Common" version="1.2.20906.2" targetFramework="net45" />
13-
<package id="Roslyn.Compilers.CSharp" version="1.2.20906.2" targetFramework="net45" />
1414
<package id="Shouldly" version="2.3.1" targetFramework="net45" />
15+
<package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
16+
<package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
1517
</packages>

0 commit comments

Comments
 (0)