Skip to content

Commit ce1e9d7

Browse files
StephenMolloyStephenMolloy
authored
Solution cleanup (#89)
* Remove unnecessary nuget refs. Cleanup project tree in VS. * Update signing info
1 parent 12975a5 commit ce1e9d7

7 files changed

Lines changed: 37 additions & 23 deletions

File tree

‎Build.cmd‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ setlocal
44

55
set EnableNuGetPackageRestore=true
66

7-
set logOptions=/flp:Summary;Verbosity=normal;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
7+
set cfgOption=/p:Configuration=Release
8+
REM set cfgOption=/p:Configuration=Debug
9+
REM set cfgOption=/p:Configuration=Debug;Release
10+
if not "%1"=="" set cfgOption=/p:Configuration=
11+
12+
REM set logOptions=/v:diag /flp:Summary;Verbosity=normal;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
13+
set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
814

915
echo Please build from VS 2015(or newer version) Developer Command Prompt
1016

11-
msbuild "%~dp0\RoslynCodeProvider.msbuild" %logOptions% /v:minimal /maxcpucount /nodeReuse:false %*
17+
msbuild "%~dp0\RoslynCodeProvider.msbuild" %logOptions% /maxcpucount /nodeReuse:false %cfgOption%
1218
if %ERRORLEVEL% neq 0 goto BuildFail
1319
goto BuildSuccess
1420

‎RoslynCodeProvider.sln‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29215.179
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{566A9F52-15C9-4BD0-AD3A-9CC7D391834E}"
77
EndProject
@@ -18,6 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packages", "src\Packages\Pa
1818
EndProject
1919
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{793EB7E3-C526-48B6-9614-7AA972D9BB46}"
2020
ProjectSection(SolutionItems) = preProject
21+
README.md = README.md
2122
packages\repositories.config = packages\repositories.config
2223
RoslynCodeProvider.msbuild = RoslynCodeProvider.msbuild
2324
tools\RoslynCodeProvider.settings.targets = tools\RoslynCodeProvider.settings.targets
@@ -57,4 +58,7 @@ Global
5758
{BE52ED6A-F180-499D-80BB-B0237B50023C} = {566A9F52-15C9-4BD0-AD3A-9CC7D391834E}
5859
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A} = {566A9F52-15C9-4BD0-AD3A-9CC7D391834E}
5960
EndGlobalSection
61+
GlobalSection(ExtensibilityGlobals) = postSolution
62+
SolutionGuid = {A5B8F404-C4DF-48B5-80FE-6FC256ADCEC3}
63+
EndGlobalSection
6064
EndGlobal

‎src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/CSharpCodeProvider.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
using System;
55
using System.CodeDom.Compiler;
6+
using System.ComponentModel;
67

78
namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
89
/// <summary>
910
/// Provides access to instances of the .NET Compiler Platform C# code generator and code compiler.
1011
/// </summary>
12+
[DesignerCategory("code")]
1113
public sealed class CSharpCodeProvider : Microsoft.CSharp.CSharpCodeProvider {
1214
private ICompilerSettings _compilerSettings;
1315

‎src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,14 @@
5555
<Compile Include="AppSettings.cs" />
5656
<Compile Include="Compiler.cs" />
5757
<Compile Include="CSharpCompiler.cs" />
58-
<Compile Include="CSharpCodeProvider.cs">
59-
<SubType>Component</SubType>
60-
</Compile>
58+
<Compile Include="CSharpCodeProvider.cs" />
6159
<Compile Include="Properties\AssemblyInfo.cs" />
6260
<Compile Include="Util\CompilationSettings.cs" />
6361
<Compile Include="Util\CompilationUtil.cs" />
6462
<Compile Include="Util\ICompilerSettings.cs" />
65-
<Compile Include="VBCodeProvider.cs">
66-
<SubType>Component</SubType>
67-
</Compile>
63+
<Compile Include="VBCodeProvider.cs" />
6864
<Compile Include="VBCompiler.cs" />
6965
</ItemGroup>
70-
<ItemGroup>
71-
<None Include="packages.config" />
72-
</ItemGroup>
7366
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7467
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7568
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -81,7 +74,7 @@
8174
<Target Name="AfterBuild">
8275
<ItemGroup>
8376
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
84-
<Authenticode>Microsoft</Authenticode>
77+
<Authenticode>Microsoft400</Authenticode>
8578
<StrongName>MsSharedLib72</StrongName>
8679
</FilesToSign>
8780
</ItemGroup>

‎src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCodeProvider.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
using System;
55
using System.CodeDom.Compiler;
6+
using System.ComponentModel;
67

78
namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
89
/// <summary>
910
/// Provides access to instances of the .NET Compiler Platform VB code generator and code compiler.
1011
/// </summary>
12+
[DesignerCategory("code")]
1113
public sealed class VBCodeProvider : Microsoft.VisualBasic.VBCodeProvider {
1214
private ICompilerSettings _compilerSettings;
1315

‎src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/packages.config‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Packages/Packages.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
2020
<ItemGroup>
2121
<NuGetProject Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj" />
22+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuspec" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" />
26+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.Extensions.props" />
27+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.Extensions.props" />
28+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net45\app.config.install.xdt" />
29+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net45\app.config.uninstall.xdt" />
30+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net45\web.config.install.xdt" />
31+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net45\web.config.ininstall.xdt" />
32+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net46\app.config.install.xdt" />
33+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net46\app.config.uninstall.xdt" />
34+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net46\web.config.install.xdt" />
35+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\content\net46\web.config.ininstall.xdt" />
36+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\tools\install.ps1" />
37+
<None Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform\tools\uninstall.ps1" />
2238
</ItemGroup>
2339
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
2440
<Target Name="Build">

0 commit comments

Comments
 (0)