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

Commit c0bc7bd

Browse files
smaillet-mssmaillet-ms
committed
Merge pull request #260 from smaillet-ms/Fix-VS14-VSIX-Solution
Support to build VS integration directly in VS2015
2 parents aa2330e + be8e356 commit c0bc7bd

File tree

25 files changed

+498
-279
lines changed

25 files changed

+498
-279
lines changed

‎Framework/CorDebug/VsPackage.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ internal interface IVsMicrosoftInstalledProduct
6363
, TemplateIDsVsTemplate=VsPackage.VbTemplateIds
6464
)
6565
]
66-
[ProvideExpressLoadKey( "4.3.0.0", "Microsoft .NET Micro Framework SDK", "Microsoft Corporation", VsWinExpressId=1001 )]
6766
[ProvideObject( typeof( PropertyPageComObject ) )]
6867
[ProvideObject( typeof( CorDebug ) )]
6968
[ProvideDebugEngine]

‎Framework/CorDebug/vs12/cordebugvs12.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@
181181
<ProjectReference Include="..\..\Debugger\Debugger.csproj">
182182
<Project>{d9dca6fb-680f-4355-abef-128db02721e6}</Project>
183183
<Name>Debugger</Name>
184+
<Private>False</Private>
185+
</ProjectReference>
186+
<ProjectReference Include="..\..\Debugger\WinUsb\WinUsb.csproj">
187+
<Project>{daeb83a4-5868-4725-a15d-85f75db87eac}</Project>
188+
<Name>WinUsb</Name>
189+
<Private>False</Private>
184190
</ProjectReference>
185191
</ItemGroup>
186192
<PropertyGroup>

‎Framework/CorDebug/vs12/source.extension.vsixmanifest‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
</Metadata>
1414
<Installation InstalledByMsi="false">
1515
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[12.0,13.0)" />
16-
<InstallationTarget Version="[12.0,13.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
1716
</Installation>
1817
<Dependencies>
1918
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />

‎Framework/CorDebug/vs14/cordebugvs14.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@
188188
<ProjectReference Include="..\..\Debugger\Debugger.csproj">
189189
<Project>{d9dca6fb-680f-4355-abef-128db02721e6}</Project>
190190
<Name>Debugger</Name>
191+
<Private>False</Private>
192+
</ProjectReference>
193+
<ProjectReference Include="..\..\Debugger\WinUsb\WinUsb.csproj">
194+
<Project>{daeb83a4-5868-4725-a15d-85f75db87eac}</Project>
195+
<Name>WinUsb</Name>
196+
<Private>False</Private>
191197
</ProjectReference>
192198
</ItemGroup>
193199
<PropertyGroup>

‎Framework/CorDebug/vs14/cordebugvs14.sln‎

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,109 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22823.1
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetmfVS14", "NetmfVS14.csproj", "{F15F8516-14E8-4CE2-8810-59CB869E1C38}"
7+
EndProject
68
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cordebugvs14", "cordebugvs14.csproj", "{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}"
79
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger", "..\..\Debugger\Debugger.csproj", "{D9DCA6FB-680F-4355-ABEF-128DB02721E6}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUsb", "..\..\Debugger\WinUsb\WinUsb.csproj", "{DAEB83A4-5868-4725-A15D-85F75DB87EAC}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassTemplateProject", "..\..\..\Product\AllSDK\ItemTemplates\CSharp\Class\ClassTemplateProject.csproj", "{32FD8868-BC4E-4810-B811-66CF6B38FA02}"
15+
EndProject
816
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExeTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\CSharp\ExeTemplate\ExeTemplateProject.csproj", "{08FF08A7-6883-4875-BBC5-5F9405D59B4D}"
917
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\CSharp\WinTemplate\WinTemplateProject.csproj", "{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}"
19+
EndProject
1020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\CSharp\LibTemplate\LibTemplateProject.csproj", "{0F0DFBB2-249D-4769-BF7D-29885153CF87}"
1121
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\CSharp\WinTemplate\WinTemplateProject.csproj", "{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}"
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp Templates", "CSharp Templates", "{77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}"
1323
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetmfVS14", "NetmfVS14.csproj", "{F15F8516-14E8-4CE2-8810-59CB869E1C38}"
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB Templates", "VB Templates", "{B38D2886-E83D-416F-BA54-03AA6378E508}"
1525
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger", "..\..\Debugger\Debugger.csproj", "{D9DCA6FB-680F-4355-ABEF-128DB02721E6}"
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBClassTemplateProject", "..\..\..\Product\AllSDK\ItemTemplates\VisualBasic\Class\VBClassTemplateProject.csproj", "{64BB93E1-F7F1-425E-89BF-1BDECEF523AC}"
1727
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUsb", "..\..\Debugger\WinUsb\WinUsb.csproj", "{DAEB83A4-5868-4725-A15D-85F75DB87EAC}"
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBExeTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\VB\ExeTemplate\VBExeTemplateProject.csproj", "{898B220F-11FF-400D-B40C-588CF06DF856}"
29+
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBLibTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\VB\LibTemplate\VBLibTemplateProject.csproj", "{BC660833-4208-4D3E-B744-4AD17D502F8E}"
31+
EndProject
32+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBWinTemplateProject", "..\..\..\Product\AllSDK\ProjectTemplates\VB\WinTemplate\VBWinTemplateProject.csproj", "{517662A3-1886-4811-818E-AB0333447656}"
33+
EndProject
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyInfoTemplateProject", "..\..\..\Product\AllSDK\ItemTemplates\CSharp\AssemblyInfo\AssemblyInfoTemplateProject.csproj", "{422D820B-8B80-4FF1-9828-3AB113C2ABC0}"
1935
EndProject
2036
Global
2137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2238
Debug|Any CPU = Debug|Any CPU
2339
Release|Any CPU = Release|Any CPU
2440
EndGlobalSection
2541
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Debug|Any CPU.ActiveCfg = Release|Any CPU
27-
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Debug|Any CPU.Build.0 = Release|Any CPU
42+
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Debug|Any CPU.Build.0 = Debug|Any CPU
2848
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Release|Any CPU.ActiveCfg = Release|Any CPU
2949
{B4C10D84-59C4-48EE-A62B-9DA56A2E9681}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{32FD8868-BC4E-4810-B811-66CF6B38FA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{32FD8868-BC4E-4810-B811-66CF6B38FA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{32FD8868-BC4E-4810-B811-66CF6B38FA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{32FD8868-BC4E-4810-B811-66CF6B38FA02}.Release|Any CPU.Build.0 = Release|Any CPU
3062
{08FF08A7-6883-4875-BBC5-5F9405D59B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3163
{08FF08A7-6883-4875-BBC5-5F9405D59B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
3264
{08FF08A7-6883-4875-BBC5-5F9405D59B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
3365
{08FF08A7-6883-4875-BBC5-5F9405D59B4D}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Release|Any CPU.Build.0 = Release|Any CPU
3866
{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3967
{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}.Debug|Any CPU.Build.0 = Debug|Any CPU
4068
{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}.Release|Any CPU.ActiveCfg = Release|Any CPU
4169
{D300D44B-0B0F-450F-B4A1-D4DCE9590F88}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{F15F8516-14E8-4CE2-8810-59CB869E1C38}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Release|Any CPU.ActiveCfg = Debug|Any CPU
49-
{D9DCA6FB-680F-4355-ABEF-128DB02721E6}.Release|Any CPU.Build.0 = Debug|Any CPU
50-
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51-
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
52-
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
53-
{DAEB83A4-5868-4725-A15D-85F75DB87EAC}.Release|Any CPU.Build.0 = Debug|Any CPU
70+
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{0F0DFBB2-249D-4769-BF7D-29885153CF87}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{64BB93E1-F7F1-425E-89BF-1BDECEF523AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{64BB93E1-F7F1-425E-89BF-1BDECEF523AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{64BB93E1-F7F1-425E-89BF-1BDECEF523AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{64BB93E1-F7F1-425E-89BF-1BDECEF523AC}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{898B220F-11FF-400D-B40C-588CF06DF856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{898B220F-11FF-400D-B40C-588CF06DF856}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{898B220F-11FF-400D-B40C-588CF06DF856}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{898B220F-11FF-400D-B40C-588CF06DF856}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{BC660833-4208-4D3E-B744-4AD17D502F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{BC660833-4208-4D3E-B744-4AD17D502F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{BC660833-4208-4D3E-B744-4AD17D502F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{BC660833-4208-4D3E-B744-4AD17D502F8E}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{517662A3-1886-4811-818E-AB0333447656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{517662A3-1886-4811-818E-AB0333447656}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{517662A3-1886-4811-818E-AB0333447656}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{517662A3-1886-4811-818E-AB0333447656}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{422D820B-8B80-4FF1-9828-3AB113C2ABC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{422D820B-8B80-4FF1-9828-3AB113C2ABC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{422D820B-8B80-4FF1-9828-3AB113C2ABC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{422D820B-8B80-4FF1-9828-3AB113C2ABC0}.Release|Any CPU.Build.0 = Release|Any CPU
5494
EndGlobalSection
5595
GlobalSection(SolutionProperties) = preSolution
5696
HideSolutionNode = FALSE
5797
EndGlobalSection
98+
GlobalSection(NestedProjects) = preSolution
99+
{32FD8868-BC4E-4810-B811-66CF6B38FA02} = {77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}
100+
{08FF08A7-6883-4875-BBC5-5F9405D59B4D} = {77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}
101+
{D300D44B-0B0F-450F-B4A1-D4DCE9590F88} = {77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}
102+
{0F0DFBB2-249D-4769-BF7D-29885153CF87} = {77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}
103+
{64BB93E1-F7F1-425E-89BF-1BDECEF523AC} = {B38D2886-E83D-416F-BA54-03AA6378E508}
104+
{898B220F-11FF-400D-B40C-588CF06DF856} = {B38D2886-E83D-416F-BA54-03AA6378E508}
105+
{BC660833-4208-4D3E-B744-4AD17D502F8E} = {B38D2886-E83D-416F-BA54-03AA6378E508}
106+
{517662A3-1886-4811-818E-AB0333447656} = {B38D2886-E83D-416F-BA54-03AA6378E508}
107+
{422D820B-8B80-4FF1-9828-3AB113C2ABC0} = {77AA22F3-7971-4C7D-B741-BE7D58CA5B0B}
108+
EndGlobalSection
58109
EndGlobal

‎Framework/CorDebug/vs14/source.extension.vsixmanifest‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Metadata>
44
<Identity Id="Microsoft.NETMF.CoreDebug.vs14" Version="4.4.0.0" Language="en-US" Publisher="Microsoft" />
55
<DisplayName>.NET Micro Framework project system</DisplayName>
6-
<Description xml:space="preserve">Visual Studio Next(VS14 CTP) Project System for the .NET Micro Framework</Description>
6+
<Description xml:space="preserve">Visual Studio 2015 Project System for the .NET Micro Framework</Description>
77
<MoreInfo>http://www.netmf.com</MoreInfo>
88
<License>License.rtf</License>
99
<GettingStartedGuide>http://www.netmf.com</GettingStartedGuide>
@@ -13,15 +13,14 @@
1313
</Metadata>
1414
<Installation InstalledByMsi="false">
1515
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0,15.0)" />
16-
<InstallationTarget Version="[12.0,13.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
1716
</Installation>
1817
<Dependencies>
1918
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
2019
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
2120
</Dependencies>
2221
<Assets>
2322
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
24-
<Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
23+
<Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
2524
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="Microsoft.SPOT.Debugger.CorDebug.14.pkgdef" />
2625
</Assets>
2726
</PackageManifest>

‎Framework/Debugger/Debugger.csproj‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<SccLocalPath>SAK</SccLocalPath>
2525
<SccAuxPath>SAK</SccAuxPath>
2626
<SccProvider>SAK</SccProvider>
27+
<OutDir>$(BUILD_TREE_SERVER)\DLL\</OutDir>
2728
</PropertyGroup>
2829
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2930
<RunCodeAnalysis>false</RunCodeAnalysis>
@@ -33,6 +34,18 @@
3334
<CodeAnalysisRuleSet>Debugger.ruleset</CodeAnalysisRuleSet>
3435
<CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
3536
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<OutputPath>bin\Release\</OutputPath>
40+
<DefineConstants>,DEBUG,TRACE,TINYCLR_BUILD_SERVER,TINYCLR_USESTRONGNAMES</DefineConstants>
41+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
42+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
43+
<NoWarn>,1591,1668,1762</NoWarn>
44+
<DebugType>full</DebugType>
45+
<PlatformTarget>AnyCPU</PlatformTarget>
46+
<CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
47+
<CodeAnalysisRuleSet>Debugger.ruleset</CodeAnalysisRuleSet>
48+
</PropertyGroup>
3649
<ItemGroup>
3750
<Compile Include="AbortHandler.cs" />
3851
<Compile Include="ArmDisassembler.cs" />
@@ -103,11 +116,11 @@
103116
<Reference Include="Microsoft.Build.Utilities.v4.0" />
104117
<Reference Include="Microsoft.SPOT.Tasks">
105118
<HintPath>$(BUILD_TREE_SERVER)\DLL\Microsoft.SPOT.Tasks.dll</HintPath>
106-
<Private>true</Private>
119+
<Private>false</Private>
107120
</Reference>
108121
<Reference Include="WinUsbInvoke">
109122
<HintPath>$(BUILD_TREE_SERVER)\DLL\WinUsbInvoke.dll</HintPath>
110-
<Private>true</Private>
123+
<Private>false</Private>
111124
</Reference>
112125
</ItemGroup>
113126
<ItemGroup>

‎Framework/Debugger/WinUsb/WinUsb.csproj‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
44
<PropertyGroup>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6-
<Configuration Condition="'$(FLAVOR_WIN)'!=''">$(FLAVOR_WIN)</Configuration>
7-
<SccProjectName>SAK</SccProjectName>
8-
<SccLocalPath>SAK</SccLocalPath>
9-
<SccAuxPath>SAK</SccAuxPath>
10-
<SccProvider>SAK</SccProvider>
6+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
7+
<TargetFrameworkProfile />
118
</PropertyGroup>
129
<PropertyGroup>
10+
<AssemblyName>WinUsbInvoke</AssemblyName>
11+
<OutputType>Library</OutputType>
12+
<RootNamespace>WinUsb</RootNamespace>
13+
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1314
<ProductVersion>9.0.21022</ProductVersion>
1415
<SchemaVersion>2.0</SchemaVersion>
1516
<ProjectGuid>{DAEB83A4-5868-4725-A15D-85F75DB87EAC}</ProjectGuid>
16-
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<ComponentGuid>{aa03c31f-e697-4668-9206-3b2cc39e8a44}</ComponentGuid>
1818
<DirectoryRef>ToolsDir</DirectoryRef>
19-
<OutputType>Library</OutputType>
2019
<AssemblyType>Library</AssemblyType>
2120
<AppDesignerFolder>Properties</AppDesignerFolder>
22-
<RootNamespace>WinUsb</RootNamespace>
23-
<AssemblyName>WinUsbInvoke</AssemblyName>
21+
<SccProjectName>SAK</SccProjectName>
22+
<SccLocalPath>SAK</SccLocalPath>
23+
<SccAuxPath>SAK</SccAuxPath>
24+
<SccProvider>SAK</SccProvider>
25+
<OutDir>$(BUILD_TREE_SERVER)\DLL\</OutDir>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
28+
<DebugSymbols>true</DebugSymbols>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>,DEBUG,TRACE,TINYCLR_BUILD_SERVER,TINYCLR_USESTRONGNAMES</DefineConstants>
31+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
32+
<NoWarn>,1668,1762</NoWarn>
33+
<DebugType>full</DebugType>
34+
<PlatformTarget>AnyCPU</PlatformTarget>
35+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2436
</PropertyGroup>
2537
<ItemGroup>
2638
<Reference Include="System" />

0 commit comments

Comments
 (0)