Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit

Permalink
Build SDK using only VS14
Browse files Browse the repository at this point in the history 
- Fixed comment type in BuildHelper\dotnetmf.proj
- Upgraded VS integration projects to use VS14
- Fixed setenv_base.cmd to allow building VS2012 VSIX package
  • Loading branch information
@smaillet-ms
smaillet-ms committed May 21, 2015
1 parent 0c67011 commit ae0f29a
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion BuildEnv.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<FLAVOR_WIN Condition="'$(FLAVOR_WIN)'=='' AND '$(Configuration)'!='Debug'" >Release</FLAVOR_WIN>
<FLAVOR_MEMORY Condition="'$(FLAVOR_MEMORY)'==''">FLASH</FLAVOR_MEMORY>
<CLRLIB Condition="'$(CLRLIB)'==''">$(SPOCLIENT)\Tools\Libraries</CLRLIB>
<VisualStudioVersion Condition="'$(VisualStudioVersion)'==''" >12.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)'==''" >14.0</VisualStudioVersion>
<!-- use registry to get VC install directory (this is what the VCVARS32.bat does for a VS command prompt) -->
<VcInstallDir Condition="'$(VcInstallDir)'==''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VC7', '$(VisualStudioVersion)', null, RegistryView.Registry32))</VcInstallDir>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion CLR/Tools/BuildHelper/dotNetMF.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Subsystem>CONSOLE</Subsystem>
<!--LNK4199: /DELAYLOAD:dllname ignored; no imports found from dllname -->
<LinkIgnore>4199</LinkIgnore>
<!-- warning C4091: 'typedef ': ignored on left of 'Midentifier>' when no variable is declared -->
<!-- warning C4091: 'typedef ': ignored on left of '<identifier>' when no variable is declared -->
<ExtraFlags>/wd4091</ExtraFlags>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Framework/CorDebug/DiagnosticStrings.Designer.cs
View file

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

6 changes: 3 additions & 3 deletions Framework/CorDebug/Properties/Resources.Designer.cs
View file

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

2 changes: 1 addition & 1 deletion Framework/CorDebug/vs14/NetmfVS14.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down
26 changes: 13 additions & 13 deletions Framework/CorDebug/vs14/cordebugvs14.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<InstrumentForCoverage>true</InstrumentForCoverage>
<PlatformTarget>x86</PlatformTarget>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<NetMFBuildVsSdkVersion>14</NetMFBuildVsSdkVersion>
<OutDir>$(BUILD_TREE_SERVER)\DLL\</OutDir>
</PropertyGroup>
Expand All @@ -40,32 +40,32 @@
<DeployExtension>False</DeployExtension>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.AppDesigner, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.VisualStudio.AppDesigner, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Editors,version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.VisualStudio.Editors,version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.ManagedInterfaces" />
<Reference Include="Microsoft.VisualStudio.Shell.14.0" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="Microsoft.Build.Framework, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.Build.Framework, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="Microsoft.Build.Engine, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral" >
<SpecificVersion>true</SpecificVersion>
<Reference Include="Microsoft.Build.Engine, Version=14.0.0.0,publicKeyToken=b03f5f7f11d50a3a,culture=neutral">
<SpecificVersion>true</SpecificVersion>
</Reference>
<Reference Include="Microsoft.Build.Tasks.v4.0" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
Expand Down
4 changes: 2 additions & 2 deletions Framework/CorDebug/vs14/cordebugvs14.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 2013
VisualStudioVersion = 12.0.30501.0
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cordebugvs14", "cordebugvs14.csproj", "{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}"
EndProject
Expand Down
6 changes: 4 additions & 2 deletions Framework/Debugger/Debugger.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Project DefaultTargets="TinyCLR_Build" InitialTargets="ShowInfo" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
<PropertyGroup>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<Configuration Condition="'$(FLAVOR_WIN)'!=''">$(FLAVOR_WIN)</Configuration>

This comment has been minimized.

# to view

Copy link
@smaillet-ms

smaillet-ms Jun 29, 2016

Author Member

Why is this being removed? This was set to allow the configuration to follow the FLAVOR_WIN setting automatically if it was set.
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -127,4 +126,7 @@
<None Include="ClassDiagram1.cd" />
</ItemGroup>
<Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.CSharp.Host.Targets" />
<Target Name="ShowInfo">
<Message Importance="high" Text="Configuration=$(Configuration); FLAVOR_WIN=$(FLAVOR_WIN)" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Product/AllSDK/ProjectTemplates/CSharp/ExeTemplate/ExeTemplateProject.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NetMFTemplateName>MFConsoleApplication</NetMFTemplateName>
Expand Down
2 changes: 1 addition & 1 deletion Product/AllSDK/ProjectTemplates/CSharp/LibTemplate/LibTemplateProject.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NetMFTemplateName>MFClassLibrary</NetMFTemplateName>
Expand Down
2 changes: 1 addition & 1 deletion Product/AllSDK/ProjectTemplates/CSharp/WinTemplate/WinTemplateProject.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>

This comment has been minimized.

# to view

Copy link
@smaillet-ms

smaillet-ms Jun 29, 2016

Author Member

If minimum version is 14.0 then the default here should match as well.
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NetMFTemplateName>MFWindowApplication</NetMFTemplateName>
Expand Down
3 changes: 3 additions & 0 deletions setenv_base.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ GOTO :EOF

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_VS_VARS
set VSSDK12INSTALLDIR=%SPOROOT%\tools\x86\MicrosoftSDKs\VSSDK\vs12\
if NOT EXIST "%VSSDK12INSTALLDIR%" set VSSDK12INSTALLDIR=%VSSDK120Install%

set VSSDK14INSTALLDIR=%SPOROOT%\tools\x86\MicrosoftSDKs\VSSDK\vs14\
if NOT EXIST "%VSSDK14INSTALLDIR%" set VSSDK14INSTALLDIR=%VSSDK140Install%

Expand Down
1 change: 0 additions & 1 deletion setup/ProductSDK/VsixPackages.dirproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
/>
</Target>
<Target Name="CheckForPrerequisites">
<Warning Condition="!Exists('$(VSSDK11INSTALLDIR)')" Code="NETMF" Text="Visual Studio 2012 SDK not found VSIX package will not be generated" />
<Warning Condition="!Exists('$(VSSDK12INSTALLDIR)')" Code="NETMF" Text="Visual Studio 2013 SDK not found VSIX package will not be generated" />
<Warning Condition="!Exists('$(VSSDK14INSTALLDIR)')" Code="NETMF" Text="Visual Studio 2015 SDK not found VSIX package will not be generated" />
</Target>
Expand Down

2 comments on commit ae0f29a

@miloush
Copy link

@miloush miloush commented on ae0f29a Jun 26, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Re: BuildEnv.props - starting with VS14, Microsoft.Build.Tasks.v12.0.dll was renamed to Microsoft.Build.Tasks.Core.dll
(same in tools/Targets/Microsoft.SPOT.Support.Settings)

$(MSBuildToolsPath) must be pointing to v12.0 to get it build this way, doesn't it?

EDIT: I see, that's because all project files still have ToolsVersion="12.0"

@smaillet-ms
Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, the reason for that was not requiring VS14 but allowing it, however since then the VS team launched the "Community Edition" making the distinction a bit of a moot point.

Please # to comment.