Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Blue Moon theme #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions VSColorThemes/ThemeRegistration.pkgdef
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
@="Bigface"
"Name"="Bigface"

[$RootKey$\Themes\{c5bcc613-2c3e-4e7b-8e9e-8659acd2e1e2}]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see your actual theme file as part of this set of changes? Did you forget to add it?

@="Blue Moon"
"Name"="Blue Moon"

[$RootKey$\Themes\{7bcb0df8-497b-4625-a516-85eb952736d4}]
@="Dark With Light Editor"
"Name"="Dark With Light Editor"
Expand Down
227 changes: 118 additions & 109 deletions VSColorThemes/VSColorThemes.csproj
Original file line number Diff line number Diff line change
@@ -1,110 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{1FC2FBAD-2D86-44AA-9614-B328B6DBC408}</ProjectGuid>
<OutputType>Library</OutputType>
<VsixType>v3</VsixType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VSColorThemes</RootNamespace>
<AssemblyName>VSColorThemes</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<StartAction>Program</StartAction>
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
<ThemeExtension>.pkgdef</ThemeExtension>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="EULA.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<ItemGroup>
<Content Include="ReleaseNotes.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="ThemeRegistration.pkgdef">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Themes\Bigface.xml" />
<Content Include="Themes\DarkExtraContrast.xml" />
<Content Include="Themes\DarkWithLightEditor.xml" />
<Content Include="Themes\Green.xml" />
<Content Include="Themes\GreenShah.xml" />
<Content Include="Themes\LightWithDarkEditor.xml" />
<Content Include="Themes\MaterialDark.xml" />
<Content Include="Themes\PlainDark.xml" />
<Content Include="Themes\Purple.xml" />
<Content Include="Themes\Red.xml" />
<Content Include="Themes\SolarizedDark.xml" />
<Content Include="Themes\SolarizedLight.xml" />
<Content Include="Themes\SublimeMaterialDark.xml" />
<Content Include="Themes\Tan.xml" />
<Content Include="VsColorTheme_Icon_90x.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<PropertyGroup>
<CompileColorsBuildCommand>"$(VsInstallRoot)\VSSDK\VisualStudioIntegration\Tools\Bin\VsixColorCompiler.exe"</CompileColorsBuildCommand>
</PropertyGroup>
<ItemGroup>
<CompileColors Include="Themes\*.xml">
<Visible>False</Visible>
</CompileColors>
</ItemGroup>
<Target Name="CompileColorsToPkgdef" Condition="'@(CompileColors)' != ''" BeforeTargets="BeforeBuild">
<Exec Command="$(CompileColorsBuildCommand) %(CompileColors.Identity) $(OutputPath)\$([System.IO.Path]::ChangeExtension(%(CompileColors.Identity),$(ThemeExtension)))" />
</Target>
<Target Name="AddPkgDefFiles" DependsOnTargets="CompileColorsToPkgdef" BeforeTargets="BeforeBuild">
<ItemGroup>
<Content Include="$(OutputPath)\Themes\*.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<Visible>False</Visible>
<VSIXSubPath>Themes</VSIXSubPath>
</Content>
</ItemGroup>
</Target>
<?xml version="1.0" encoding="utf-8"?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole file is showing up as different. Could you correct that? I'm assuming it's newline related.

<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{1FC2FBAD-2D86-44AA-9614-B328B6DBC408}</ProjectGuid>
<OutputType>Library</OutputType>
<VsixType>v3</VsixType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VSColorThemes</RootNamespace>
<AssemblyName>VSColorThemes</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<StartAction>Program</StartAction>
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
<ThemeExtension>.pkgdef</ThemeExtension>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="BlueMoon.pkgdef">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not add theme pkgdefs. Those are binary data and are impossible to diff easily. Please use the xml format the other themes are using.

<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="EULA.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<ItemGroup>
<Content Include="ReleaseNotes.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="ThemeRegistration.pkgdef">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Themes\Bigface.xml" />
<Content Include="Themes\BlueMoon.pkgdef">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is in here twice

<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Themes\BlueMoon.xml" />
<Content Include="Themes\DarkExtraContrast.xml" />
<Content Include="Themes\DarkWithLightEditor.xml" />
<Content Include="Themes\Green.xml" />
<Content Include="Themes\GreenShah.xml" />
<Content Include="Themes\LightWithDarkEditor.xml" />
<Content Include="Themes\MaterialDark.xml" />
<Content Include="Themes\PlainDark.xml" />
<Content Include="Themes\Purple.xml" />
<Content Include="Themes\Red.xml" />
<Content Include="Themes\SolarizedDark.xml" />
<Content Include="Themes\SolarizedLight.xml" />
<Content Include="Themes\SublimeMaterialDark.xml" />
<Content Include="Themes\Tan.xml" />
<Content Include="VsColorTheme_Icon_90x.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<PropertyGroup>
<CompileColorsBuildCommand>"$(VsInstallRoot)\VSSDK\VisualStudioIntegration\Tools\Bin\VsixColorCompiler.exe"</CompileColorsBuildCommand>
</PropertyGroup>
<ItemGroup>
<CompileColors Include="Themes\*.xml">
<Visible>False</Visible>
</CompileColors>
</ItemGroup>
<Target Name="CompileColorsToPkgdef" Condition="'@(CompileColors)' != ''" BeforeTargets="BeforeBuild">
<Exec Command="$(CompileColorsBuildCommand) %(CompileColors.Identity) $(OutputPath)\$([System.IO.Path]::ChangeExtension(%(CompileColors.Identity),$(ThemeExtension)))" />
</Target>
<Target Name="AddPkgDefFiles" DependsOnTargets="CompileColorsToPkgdef" BeforeTargets="BeforeBuild">
<ItemGroup>
<Content Include="$(OutputPath)\Themes\*.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<Visible>False</Visible>
<VSIXSubPath>Themes</VSIXSubPath>
</Content>
</ItemGroup>
</Target>
</Project>
1 change: 1 addition & 0 deletions VSColorThemes/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Themes\SublimeMaterialDark.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Themes\Tan.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ThemeRegistration.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Themes\BlueMoon.pkgdef" d:VsixSubPath="Themes" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The subpath attribute is not needed

</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
Expand Down