Skip to content

Commit e1386ea

Browse files
GrahamTheCoderGrahamTheCoder
authored
Merge pull request #278 from icsharpcode/vs-15-3
VS 2017 15.3
2 parents a8c05a3 + c8a7f98 commit e1386ea

8 files changed

Lines changed: 38 additions & 24 deletions

File tree

‎.gitattributes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* text eol=crlf
2+
*.png binary
3+
*.jpeg binary
4+
*.jpg binary
5+
*.gif binary

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# Change Log
22
All notable changes to the code converter will be documented here.
33

4-
# 6.6.0 TBC
4+
# 6.7.0 TBC
5+
6+
* Downgrade Roslyn requirement in attempt to work with VS2017 15.3+
7+
8+
### VB -> C#
9+
* Ensure "new()" generic constraint is last
10+
* Do not convert MyBase.Finalize, it's implicit
11+
* Standardize case of identifiers
12+
13+
# 6.6.0 29/03/2019
514

615
* Ask people to upgrade VS if missing languageservices
716

‎CodeConverter.Web/CodeConverter.Web.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
6-
<AssemblyVersion>6.6.0.0</AssemblyVersion>
7-
<FileVersion>6.6.0.0</FileVersion>
8-
<Version>6.6.0</Version>
6+
<AssemblyVersion>6.7.0.0</AssemblyVersion>
7+
<FileVersion>6.7.0.0</FileVersion>
8+
<Version>6.7.0</Version>
99
</PropertyGroup>
1010

1111
<ItemGroup>

‎ICSharpCode.CodeConverter/ICSharpCode.CodeConverter.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* Completely free and open source: Check out [GitHub](https://github.com/icsharpcode/CodeConverter#code-converter-).</Description>
1313
<Product>Code Converter for C# to/from VB.NET</Product>
1414
<Copyright>Copyright (c) 2014-2018 AlphaSierraPapa</Copyright>
15-
<AssemblyVersion>6.6.0.0</AssemblyVersion>
16-
<FileVersion>6.6.0.0</FileVersion>
17-
<Version>6.6.0</Version>
15+
<AssemblyVersion>6.7.0.0</AssemblyVersion>
16+
<FileVersion>6.7.0.0</FileVersion>
17+
<Version>6.7.0</Version>
1818
<PackageId>ICSharpCode.CodeConverter</PackageId>
1919
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2020
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -37,10 +37,10 @@
3737
<EmbeddedResource Include="Shared\DefaultReferences.cs" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
41-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
42-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.10.0" />
43-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.10.0" />
40+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
41+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.2" />
42+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.3.2" />
43+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.3.2" />
4444
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Convert code from VB.NET to C# and vice versa via Roslyn using a [Visual Studio
55
## Visual Studio Extension
66
Adds context menu items to convert projects/files between VB.NET and C#. See the [wiki documentation](https://github.com/icsharpcode/CodeConverter/wiki) for help using it.
77

8-
[Download from Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=SharpDevelopTeam.CodeConverter) (Requires VS 2017 15.9.3+)
8+
[Download from Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=SharpDevelopTeam.CodeConverter) (Requires VS 2017 15.3+)
99

1010
* Flexible: Convert a small selection, or a whole solution in one go, in either direction.
1111
* Accurate: Full project context (through Roslyn) is used to get the most accurate conversion.

‎Vsix/Vsix.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<AppDesignerFolder>Properties</AppDesignerFolder>
5252
<RootNamespace>CodeConverter.VsExtension</RootNamespace>
5353
<AssemblyName>CodeConverter.VsExtension</AssemblyName>
54-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
54+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
5555
<GeneratePkgDefFile>true</GeneratePkgDefFile>
5656
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
5757
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -87,20 +87,20 @@
8787
<Version>10.0.3</Version>
8888
</PackageReference>
8989
<PackageReference Include="ManagedEsent" Version="1.9.4" />
90-
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.10.0" />
91-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.3">
90+
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.3.2" />
91+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0">
9292
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
9393
<PrivateAssets>all</PrivateAssets>
9494
</PackageReference>
95-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="2.10.0" />
96-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
97-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
95+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="2.3.2" />
96+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
97+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.2" />
9898
<PackageReference Include="Microsoft.CodeAnalysis.Elfie" Version="0.10.6" />
99-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.10.0" />
100-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.10.0" />
101-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.10.0" />
99+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.3.2" />
100+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.3.2" />
101+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.3.2" />
102102
<PackageReference Include="Microsoft.Composition" Version="1.0.31" />
103-
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="2.10.0" />
103+
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="2.3.2" />
104104
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="15.0.81-pre" />
105105
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.9.3032">
106106
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎Vsix/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="6.6.0.0" Language="en-US" Publisher="IC#Code"/>
4+
<Identity Id="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="6.7.0.0" Language="en-US" Publisher="IC#Code"/>
55
<DisplayName>Code Converter C# to/from VB.NET</DisplayName>
66
<Description xml:space="preserve">Based on Roslyn, this converter allows you to convert C# code to VB.NET and vice versa</Description>
77
<License>license.txt</License>

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
platform: Any CPU
2-
version: 6.6.{build}
2+
version: 6.7.{build}
33
configuration: Debug
44
image: Visual Studio 2017
55

0 commit comments

Comments
 (0)