Skip to content

Commit

Permalink
v1.101: Added support for VS 2017
Browse files Browse the repository at this point in the history
  • Loading branch information
YassineTyphoon committed Feb 10, 2018
1 parent eed01d5 commit a4f2fea
Show file tree
Hide file tree
Showing 93 changed files with 8,167 additions and 7,385 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
################################################################################
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

Expand All @@ -8,3 +8,4 @@
/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/lib
/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/obj
/FASTBuildMonitorVSIX/FASTBuildMonitorStandalone/obj
FASTBuildMonitorVSIX/.vs/FASTBuildMonitorVSIX/v15/Server/sqlite3/storage.ide
7 changes: 5 additions & 2 deletions FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FASTBuildMonitorVSIX", "FASTBuildMonitorVSIX\FASTBuildMonitorVSIX.csproj", "{E50A8B0A-8964-4ADB-B504-71DD7228B20A}"
EndProject
Expand All @@ -28,4 +28,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B1CBC84D-A6C5-40CB-B162-CBF560A62D09}
EndGlobalSection
EndGlobal
18 changes: 9 additions & 9 deletions FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Code/FASTBuildMonitorControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,17 +380,17 @@ private void FASTBuildMonitorControl_Loaded(object sender, RoutedEventArgs e)
string authorsText = "Yassine Riahi & Liam Flookes";
string packageNameText = "FASTBuildMonitorVSIX";

// Find out the VSIX info
FASTBuildMonitorPackage.VSIXPackageInformation packageInfo = FASTBuildMonitorPackage._instance != null ? FASTBuildMonitorPackage._instance.GetCurrentVSIXPackageInformation() : null;
// Find out the VSIX info
FASTBuildMonitorPackage.VSIXPackageInformation packageInfo = FASTBuildMonitorPackage._instance != null ? FASTBuildMonitorPackage._instance.GetCurrentVSIXPackageInformation() : null;

if (packageInfo != null)
{
versionText = packageInfo._version.ToString();
authorsText = packageInfo._authors;
packageNameText = packageInfo._packageName;
}
if (packageInfo != null)
{
versionText = packageInfo._version != null? packageInfo._version.ToString() : versionText;
authorsText = packageInfo._authors != null? packageInfo._authors: authorsText;
packageNameText = packageInfo._packageName != null? packageInfo._packageName: packageNameText;
}

AboutTextBlock.Text = string.Format("{0} v{1}\nCopyright (c) 2016 {2}.\nProvided under a MIT License, see license file on github.", packageNameText, versionText, authorsText);
AboutTextBlock.Text = string.Format("{0} v{1}\nCopyright (c) 2016 {2}.\nProvided under a MIT License, see license file on github.", packageNameText, versionText, authorsText);
}


Expand Down
42 changes: 37 additions & 5 deletions FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>14.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -237,6 +257,18 @@
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup>
Expand All @@ -251,10 +283,10 @@ xcopy /Y /R /E $(TargetDir)$(TargetName).vsix $(ProjectDir)vsix\$(TargetName).
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Resources/Images.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/bin/Debug/FASTBuildMonitorVSIX.vsix
View file
Binary file not shown.
Binary file removed FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/bin/Release/FASTBuildMonitorVSIX.vsix
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Utilities" version="14.1.24720" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net452" developmentDependency="true" />
<package id="Microsoft.VSSDK.BuildTools" version="15.5.100" targetFramework="net452" developmentDependency="true" />
</packages>
21 changes: 0 additions & 21 deletions FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/source.extension - Copy.vsixmanifest
View file

This file was deleted.

41 changes: 23 additions & 18 deletions FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<Metadata>
<Identity Id="FASTBuildMonitorVSIX.44bf85a5-7635-4a2e-86d7-7b7f3bf757a8" Version="1.021" Language="en-US" Publisher="Copyright 2017 KnownShippable (Yassine Riahi &amp; Liam Flookes)" />
<DisplayName>FASTBuildMonitorVSIX</DisplayName>
<Description xml:space="preserve">FASTBuild Visual Studio viewer.</Description>
<MoreInfo>http:\\www.KnownShippable.com</MoreInfo>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
<InstallationTarget Version="[11.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0]" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0]" Id="Microsoft.VisualStudio.Pro" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Metadata>
<Identity Id="FASTBuildMonitorVSIX.44bf85a5-7635-4a2e-86d7-7b7f3bf757a8" Version="1.101" Language="en-US" Publisher="Copyright 2018 KnownShippable (Yassine Riahi &amp; Liam Flookes)" />
<DisplayName>FASTBuildMonitorVSIX</DisplayName>
<Description xml:space="preserve">FASTBuild Visual Studio viewer.</Description>
<MoreInfo>http:\\www.KnownShippable.com</MoreInfo>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
<InstallationTarget Version="[11.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0]" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26606.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
Binary file modified FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/vsix/FASTBuildMonitorVSIX.vsix
View file
Binary file not shown.
Binary file removed ...ackages/Microsoft.VSSDK.BuildTools.14.3.25420/Microsoft.VSSDK.BuildTools.14.3.25420.nupkg
View file
Binary file not shown.
Binary file removed ...ackages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Build.Tasks.dll
View file
Binary file not shown.
129 changes: 0 additions & 129 deletions ...X/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Common.props
View file

This file was deleted.

Binary file removed ...nitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe
View file
Binary file not shown.
Binary file removed ...SDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VisualStudio.Shell.Immutable.10.0.dll
View file
Binary file not shown.
Binary file removed ...uildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe
View file
Binary file not shown.
15 changes: 0 additions & 15 deletions ...itorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe.config
View file

This file was deleted.

Binary file removed ...onitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegRiched20.exe
View file
Binary file not shown.
Binary file removed FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCT.exe
View file
Binary file not shown.
Binary file removed ...nitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTCompress.dll
View file
Binary file not shown.
Binary file removed ...onitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTLibrary.dll
View file
Binary file not shown.
Loading

0 comments on commit a4f2fea

Please sign in to comment.