Skip to content
This repository was archived by the owner on Jul 12, 2022. It is now read-only.

Commit 52bdcfc

Browse files
jaredparjaredpar
committed
Merge pull request #134 from lgolding/master
Upgrade to Roslyn 1.0.0-rc3
2 parents 1378bd1 + 3c5462e commit 52bdcfc

28 files changed

+281
-403
lines changed

‎build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(MsBuildThisFileDirectory)obj\$(MSBuildProjectName)\$(Configuration)\</IntermediateOutputPath>
88
<OutputPath Condition="'$(OutputPath)' == ''">$(MsBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
9-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
9+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1010
<FileAlignment>512</FileAlignment>
1111
<RestorePackages>true</RestorePackages>
1212
</PropertyGroup>

‎src/CodeFormatter/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
@@ -11,11 +11,11 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-1.1.32.0" newVersion="1.1.32.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
1515
</dependentAssembly>
1616
<dependentAssembly>
1717
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-1.0.17.0" newVersion="1.0.17.0" />
18+
<bindingRedirect oldVersion="0.0.0.0-1.0.21.0" newVersion="1.0.21.0" />
1919
</dependentAssembly>
2020
<dependentAssembly>
2121
<assemblyIdentity name="Microsoft.CodeAnalysis.Desktop" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎src/CodeFormatter/CodeFormatter.csproj

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,57 +13,37 @@
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
1414
<ItemGroup>
1515
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
16-
<SpecificVersion>False</SpecificVersion>
17-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
16+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
17+
<Private>True</Private>
1818
</Reference>
1919
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
20-
<SpecificVersion>False</SpecificVersion>
21-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
22-
</Reference>
23-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
24-
<SpecificVersion>False</SpecificVersion>
25-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
20+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
21+
<Private>True</Private>
2622
</Reference>
2723
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
28-
<SpecificVersion>False</SpecificVersion>
29-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
30-
</Reference>
31-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
32-
<SpecificVersion>False</SpecificVersion>
33-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
34-
</Reference>
35-
<Reference Include="Microsoft.CodeAnalysis.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
24+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
25+
<Private>True</Private>
3826
</Reference>
3927
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Desktop.dll</HintPath>
28+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
29+
<Private>True</Private>
4630
</Reference>
4731
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop.dll</HintPath>
32+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
33+
<Private>True</Private>
5434
</Reference>
5535
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
36+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
37+
<Private>True</Private>
5838
</Reference>
5939
<Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
40+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc3\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
41+
<Private>True</Private>
6242
</Reference>
6343
<Reference Include="System" />
64-
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
44+
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45+
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
46+
<Private>True</Private>
6747
</Reference>
6848
<Reference Include="System.ComponentModel.Composition" />
6949
<Reference Include="System.Composition.AttributedModel, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -87,9 +67,9 @@
8767
<HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
8868
</Reference>
8969
<Reference Include="System.Core" />
90-
<Reference Include="System.Reflection.Metadata, Version=1.0.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<SpecificVersion>False</SpecificVersion>
92-
<HintPath>..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
70+
<Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
72+
<Private>True</Private>
9373
</Reference>
9474
<Reference Include="System.Xml.Linq" />
9575
<Reference Include="System.Data.DataSetExtensions" />
@@ -114,6 +94,10 @@
11494
<Name>Microsoft.DotNet.CodeFormatting</Name>
11595
</ProjectReference>
11696
</ItemGroup>
97+
<ItemGroup>
98+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
99+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
100+
</ItemGroup>
117101
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118102
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119103
Other similar extension points exist, see Microsoft.Common.targets.

‎src/CodeFormatter/packages.config

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeAnalysis" version="1.0.0-rc2" targetFramework="net45" />
4-
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net45" />
5-
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
6-
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
7-
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net45" />
8-
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0-rc2" targetFramework="net45" />
9-
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0-rc2" targetFramework="net45" />
10-
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
3+
<package id="Microsoft.CodeAnalysis" version="1.0.0-rc3" targetFramework="net45" />
4+
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc3" targetFramework="net45" />
5+
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc3" targetFramework="net45" />
6+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc3" targetFramework="net45" />
7+
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc3" targetFramework="net45" />
8+
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0-rc3" targetFramework="net45" />
9+
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0-rc3" targetFramework="net45" />
10+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc3" targetFramework="net45" />
1111
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
12-
<package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
13-
<package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
12+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
13+
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
1414
</packages>

‎src/DeadRegions/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
@@ -11,11 +11,11 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-1.1.32.0" newVersion="1.1.32.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
1515
</dependentAssembly>
1616
<dependentAssembly>
1717
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-1.0.17.0" newVersion="1.0.17.0" />
18+
<bindingRedirect oldVersion="0.0.0.0-1.0.21.0" newVersion="1.0.21.0" />
1919
</dependentAssembly>
2020
<dependentAssembly>
2121
<assemblyIdentity name="Microsoft.CodeAnalysis.Desktop" publicKeyToken="31bf3856ad364e35" culture="neutral" />

0 commit comments

Comments
 (0)