Skip to content

Commit

Permalink
-Removed DPWS support
Browse files Browse the repository at this point in the history
- removed unused (e.g. dead) code from CLR_RT_HeapBlock
- Fixed VS2015 VSIX generation when building SDK
- added XmlWriter class to System.XML and System.Xml.Legacy to enable existing tests and code using it to run with minimal changes. (Can't just pick one or the other as some tests are for one, and others for the other and the XmlWriter used to be in one of the DPWS assemblies.)
- Disabled FastCompile by default as it screws up the debug info by setting the source line info to that of the preprocessed fastcompile.cpp and not the oringal source location. Furthermore, it wasn't needed anymore with the newer licensing schemes in place for the ARMCC compiler.
- added git ignore entry to ignore temporary directories created by uVision debugger which are essentially a GUID.
  • Loading branch information
smaillet-ms committed May 12, 2015
1 parent da6c38c commit 7de0f4d
Show file tree
Hide file tree
Showing 182 changed files with 61 additions and 37,523 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ipch/
#uVision
*.uvguix*
Listings/
{*/

# WinPCAP
/DeviceCode/Targets/OS/Win32/DeviceCode/WinPcap_Eth/Dependencies/WpdPack/
Expand Down
15 changes: 0 additions & 15 deletions CLR/Core/CLR_RT_HeapBlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1897,21 +1897,6 @@ HRESULT CLR_RT_HeapBlock::TransparentProxyValidate() const
#endif //TINYCLR_APPDOMAINS
////////////////////////////////////////////////////////////////////////////////////////////////////

#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_WINCE)

static void MyAssert()
{
NATIVE_PROFILE_CLR_CORE();
DebugBreak();
}

#else

static void MyAssert() {}

#endif


void CLR_RT_HeapBlock::Relocate__HeapBlock()
{
NATIVE_PROFILE_CLR_CORE();
Expand Down
1 change: 0 additions & 1 deletion Framework/CorDebug/vs12/NetmfVS2013.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<OutDir>$(BUILD_TREE_SERVER)\DLL</OutDir>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
3 changes: 2 additions & 1 deletion Framework/CorDebug/vs14/NetmfVS14.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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>
Expand All @@ -8,6 +8,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<OutDir>$(BUILD_TREE_SERVER)\DLL</OutDir>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand Down
9 changes: 5 additions & 4 deletions Framework/CorDebug/vs14/cordebugvs14.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<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>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
Expand All @@ -8,8 +9,6 @@
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
<!-- Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/ -->
<PropertyGroup>
<ProjectType>Local</ProjectType>
<SchemaVersion>2.0</SchemaVersion>
Expand All @@ -29,7 +28,9 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<NetMFBuildVsSdkVersion>14</NetMFBuildVsSdkVersion>
<OutDir>$(BUILD_TREE_SERVER)\DLL\</OutDir>
</PropertyGroup>
<Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.CSharp.Host.Targets" />
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<CreateVsixContainer>False</CreateVsixContainer>
<DeployExtension>False</DeployExtension>
Expand Down Expand Up @@ -192,5 +193,5 @@
<PropertyGroup>
<UseCodebase>true</UseCodebase>
</PropertyGroup>
<Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.CSharp.Host.Targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
50 changes: 0 additions & 50 deletions Framework/Core/Dpws/DpwsClient/Dpws.Client.csproj

This file was deleted.

Loading

0 comments on commit 7de0f4d

Please sign in to comment.