Support nuspec file in dotnet-pack

Change-Id: If7cf631c0900670a7ab1f788df13e40b42d2dccd

diff --git a/Tools/dotnet-build.sh b/Tools/dotnet-build.sh
index 9ffaef8f9dab16a3dbb9a7dc4aa8b53858fa58f9..687678af1f9765cd714cbd8329960ef3abd915ec 100755 (executable)
--- a/Tools/dotnet-build.sh
+++ b/Tools/dotnet-build.sh
@@ -23,25 +23,10 @@ exit_on_error() {
 
 run_dotnet() {
   echo "+ dotnet $@"
-  $RETRY_CMD $TIMEOUT_CMD 600 dotnet $@
+  $RETRY_CMD $TIMEOUT_CMD 600 dotnet $@ /nologo
   exit_on_error $?
 }
 
-update_version_to_asterisk() {
-  local PROJS=""
-  if [[ $PROJECT_TYPE == "csproj" ]]; then
-    PROJS=$PROJECT
-  elif [[ $PROJECT_TYPE == "dir" ]]; then
-    PROJS=$PROJECT/*.csproj
-  elif [[ $PROJECT_TYPE == "sln" ]]; then
-    PROJS=$(find . -name "*.csproj")
-  fi
-  for p in $PROJS; do
-    xmlstarlet ed -L -u "//PackageReference/@Version" --value "*" $p
-    xmlstarlet ed -L -u "//PackageReference/@version" --value "*" $p
-  done
-}
-
 cmd_restore() {
   local OPTS=""
   [ -n "$SOURCE" ] && OPTS="$OPTS -s $SOURCE"
@@ -59,14 +44,19 @@ cmd_pack() {
   local OPTS=""
   [ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
   [ -n "$VERSION" ] && OPTS="$OPTS /p:Version=$VERSION"
-  run_dotnet pack --no-restore --no-build $PROJECT $OPTS $@ /p:UsingRPMMacro=true
+  if [[ $PROJECT == *".nuspec" ]]; then
+    NUSPECPATH=$(readlink -f $PROJECT)
+    OPTS="$OPTS /p:NuspecFile=$NUSPECPATH /p:PWD=$PWD"
+    TMPDIR=$(mktemp -d)
+    cp $SCRIPT_DIR/dummypack.csproj $TMPDIR
+    PROJECT=$TMPDIR/dummypack.csproj
+  fi
+  run_dotnet pack --no-build $PROJECT $OPTS $@ /p:UsingRPMMacro=true
 }
 
 cmd_install() {
   local DEST=$1; shift
-
   mkdir -p $DEST
-
   if [[ $TYPE == "assembly" ]]; then
     find $PROJECT/bin -name $PROJECT.dll -exec install -p -m 644 {} $DEST \;
   elif [[ $TYPE == "nupkg" ]]; then
@@ -74,21 +64,6 @@ cmd_install() {
   fi
 }
 
-cmd_nuspec_addfile() {
-  local SRC=$1; shift
-  local TARGET=$1; shift
-
-  CHK_FILES=$(xmlstarlet sel -t -v "count(/package/files)" $PROJECT)
-  if [ $CHK_FILES -eq 0 ]; then
-    xmlstarlet ed -L -s "/package" -t elem -n "files" -v "" $PROJECT
-  fi
-
-  xmlstarlet ed -L -s "/package/files" -t elem -n "file" -v "" \
-                -i "/package/files/file[last()]" -t attr -n "src" -v "$SRC" \
-                -i "/package/files/file[last()]" -t attr -n "target" -v "$TARGET" \
-                $PROJECT
-}
-
 #########################################################################
 
 # Parse arguments
@@ -111,45 +86,6 @@ fi
 CMD=$1; shift
 PROJECT=$1; shift
 
-# Check whether the project can be built using dotnet-cli
-PROJECT_TYPE=""
-USE_DOTNET_CLI=false
-if [ -f $PROJECT ]; then
-  if [[ $PROJECT == *".sln" ]]; then
-    PROJECT_TYPE="sln"
-    VS_VERSION=$(grep -E "^VisualStudioVersion" $PROJECT | cut -f2 -d= | xargs)
-    if [[ $VS_VERSION == "15."* ]]; then
-      USE_DOTNET_CLI=true
-    fi
-  elif [[ $PROJECT == *".csproj" ]]; then
-    PROJECT_TYPE="csproj"
-    RET=$(grep "Microsoft.NET.Sdk" $PROJECT | wc -l)
-    if [ $RET -gt 0 ]; then
-      USE_DOTNET_CLI=true
-    fi
-  elif [[ $PROJECT == *".project.json" ]]; then
-    PROJECT_TYPE="project.json"
-  fi
-elif [ -d $PROJECT ]; then
-  PROJECT_TYPE="dir"
-  RET=$(find $PROJECT -name "*.project.json" | wc -l)
-  if [ $RET -eq 0 ]; then
-    CSPROJS=$(find $PROJECT -name "*.csproj")
-    for p in $CSPROJS; do
-      RET=$(grep "Microsoft.NET.Sdk" $p | wc -l)
-      if [ $RET -gt 0 ]; then
-        USE_DOTNET_CLI=true
-        break;
-      fi
-    done
-  fi
-fi
-
-if [ $USE_DOTNET_CLI == false ]; then
-  echo "Not supported project type."
-  exit 1
-fi
-
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 
@@ -157,8 +93,6 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 echo "----------------------------------------------"
 echo "CMD=$CMD"
 echo "PROJECT=$PROJECT"
-echo "PROJECT_TYPE=$PROJECT_TYPE"
-echo "USE_DOTNET_CLI=$USE_DOTNET_CLI"
 echo "SOURCE=$SOURCE"
 echo "CONFIGURATION=$CONFIGURATION"
 echo "VERSION=$VERSION"
@@ -171,6 +105,5 @@ case $CMD in
   build) cmd_build $@ ;;
   pack) cmd_pack $@ ;;
   install) cmd_install $@ ;;
-  nuspec_addfile) cmd_nuspec_addfile $@ ;;
   *) usage; exit 1 ;;
 esac

diff --git a/Tools/dummypack.csproj b/Tools/dummypack.csproj
new file mode 100644 (file)
index 0000000..91a2d77
--- /dev/null
+++ b/Tools/dummypack.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NuspecProperties Condition="'$(Version)' != ''">version=$(Version)</NuspecProperties>
+    <NuspecBasePath Condition="'$(NuspecBasePath)' == ''">$(PWD)</NuspecBasePath>
+    <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(PWD)</PackageOutputPath>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file

diff --git a/dotnet/TIZEN.txt b/dotnet/TIZEN.txt
index 59ec934c6f4a9361eae7f939c59be3457de9c502..5eb9b4bf68520b64b28e0bb32725dd0536093d45 100644 (file)
--- a/dotnet/TIZEN.txt
+++ b/dotnet/TIZEN.txt
@@ -1,11 +1,5 @@
 The following files are added to build Tizen stuff with dotnet-cli.
 
-- .NETPortable targets
-sdk/*/Microsoft/Portable/*
-
-- Symlink Microsoft.CSharp.Targets
-sdk/*/Microsoft.CSharp.Targets -> sdk/*/Microsoft.CSharp.targets 
-
 - Dependent libraries for x86-64
 deps/*
 

diff --git a/dotnet/sdk/2.0.0/Microsoft.CSharp.Targets b/dotnet/sdk/2.0.0/Microsoft.CSharp.Targets
deleted file mode 120000 (symlink)
index 495bab4..0000000
--- a/dotnet/sdk/2.0.0/Microsoft.CSharp.Targets
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft.CSharp.targets
\ No newline at end of file

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.props b/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.props
deleted file mode 100755 (executable)
index eb95ac8..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Core.props\r
-\r
-Contains common properties that are shared by all portable library projects regardless of version.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <Import Project="VisualStudio\v$(VisualStudioVersion)\Microsoft.Portable.CurrentVersion.props" Condition="Exists('VisualStudio\v$(VisualStudioVersion)\Microsoft.Portable.CurrentVersion.props')"/>\r
-\r
-    <PropertyGroup>\r
-        <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier>\r
-        <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>\r
-        <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName>\r
-\r
-        <!-- Automatically reference all assemblies in the target framework -->\r
-        <ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == '' AND '$(PortableNuGetMode)' != 'true'">true</ImplicitlyExpandTargetFramework>\r
-\r
-    </PropertyGroup>\r
-\r
-    <!-- Redefine AssemblySearchPaths to exclude {AssemblyFolders} and {GAC}, these represent .NET-specific locations -->\r
-    <PropertyGroup>\r
-        <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">\r
-            {CandidateAssemblyFiles};\r
-            $(ReferencePath);\r
-            {HintPathFromItem};\r
-            {TargetFrameworkDirectory};\r
-            {Registry:$(FrameworkRegistryBase),$(TargetFrameworkVersion),$(AssemblyFoldersSuffix)$(AssemblyFoldersExConditions)};\r
-            {RawFileName};\r
-            $(OutDir)\r
-        </AssemblySearchPaths>\r
-    </PropertyGroup>\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.targets
deleted file mode 100755 (executable)
index 189ee3c..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/Microsoft.Portable.Core.targets
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Core.targets\r
-\r
-Contains common targets that are shared by all portable library projects regardless of version.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <Import Project="VisualStudio\v$(VisualStudioVersion)\Microsoft.Portable.CurrentVersion.targets" Condition="Exists('VisualStudio\v$(VisualStudioVersion)\Microsoft.Portable.CurrentVersion.targets')"/>\r
-\r
-    <Target Name="_CheckForInvalidTargetFrameworkProfile"\r
-            AfterTargets="_CheckForInvalidConfigurationAndPlatform">\r
-\r
-        <Error Condition="'$(TargetFrameworkProfile)' == '' AND '$(PortableNuGetMode)' != 'true'" Text="The TargetFrameworkProfile property is not set for project '$(MSBuildProjectFile)'. Portable projects must specify a profile."/>\r
-\r
-    </Target>\r
-\r
-    <!-- \r
-        To prevent framework assembly references from being unified to the ones in the full \r
-        framework (for example, System.Net.Primitives, v3.9.0.0 -> System.Net.Primitives, v4.0.0.0), \r
-        we set the full framework folder to the profile folder so that RAR thinks that the \r
-        profile itself is the full framework. Given that we don't actually use our full framework,\r
-        we do not need any of the warnings from RAR that are turned off because of this.\r
-    -->\r
-    <Target Name="_SetFullFrameworkFolderToProfile"\r
-            AfterTargets="GetReferenceAssemblyPaths">\r
-\r
-        <PropertyGroup>\r
-            <_FullFrameworkReferenceAssemblyPaths>$(TargetFrameworkDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
-        </PropertyGroup>\r
-    </Target>\r
-\r
-    <PropertyGroup>\r
-        <ResolveReferencesDependsOn>\r
-            $(ResolveReferencesDependsOn);\r
-            ImplicitlyExpandTargetFramework;\r
-        </ResolveReferencesDependsOn>\r
-\r
-        <ImplicitlyExpandTargetFrameworkDependsOn>\r
-            $(ImplicitlyExpandTargetFrameworkDependsOn);\r
-            GetReferenceAssemblyPaths\r
-        </ImplicitlyExpandTargetFrameworkDependsOn>\r
-\r
-    </PropertyGroup>\r
-\r
-    <!--\r
-        The ImplicitlyExpandTargetFramework target will expand all \r
-        of the dll reference assemblies in the TargetFrameworkDirectory \r
-        for the project and place the items into the ReferencePath itemgroup \r
-        which contains resolved items.\r
-    -->\r
-\r
-    <Target Name="ImplicitlyExpandTargetFramework"\r
-        Condition="'$(ImplicitlyExpandTargetFramework)' == 'true'"\r
-        DependsOnTargets="$(ImplicitlyExpandTargetFrameworkDependsOn)"\r
-    >\r
-        <ItemGroup>\r
-            <ReferenceAssemblyPaths Include="$(_TargetFrameworkDirectories)"/>\r
-            <ReferencePath Include="%(ReferenceAssemblyPaths.Identity)*.dll">\r
-                <WinMDFile>false</WinMDFile>\r
-                <CopyLocal>false</CopyLocal>\r
-                <ReferenceGroupingDisplayName>.NET</ReferenceGroupingDisplayName>\r
-                <ReferenceGrouping>$(TargetFrameworkIdentifier),$(TargetFrameworkVersion)</ReferenceGrouping>\r
-                <ResolvedFrom>ImplicitlyExpandTargetFramework</ResolvedFrom>\r
-                <IsSystemReference>True</IsSystemReference>\r
-            </ReferencePath>\r
-        </ItemGroup>\r
-\r
-        <Message Importance="Low" Text="TargetMonikerDisplayName: $(TargetFrameworkMonikerDisplayName) ReferenceAssemblyPaths: @(ReferenceAssemblyPaths)"/>\r
-\r
-        <Message Importance="Low" Text="Including @(ReferencePath)"\r
-          Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'"/>\r
-\r
-        <ItemGroup>\r
-            <_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)"\r
-              Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'"/>\r
-        </ItemGroup>\r
-    </Target>\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets
deleted file mode 100755 (executable)
index b865501..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.CSharp.targets\r
-\r
-Contains common properties and targets that are shared by all v4.0 Portable Library C# projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />    \r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-    \r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.Common.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.Common.targets
deleted file mode 100755 (executable)
index a95b73d..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.Common.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Common.targets\r
-\r
-Contains common properties that are shared by all v4.0 Portable Library projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <Import Project="..\Microsoft.Portable.Core.props" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.VisualBasic.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.VisualBasic.targets
deleted file mode 100755 (executable)
index a24d84f..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.0/Microsoft.Portable.VisualBasic.targets
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.VisualBasic.targets\r
-\r
-Contains common properties and targets that are shared by all v4.0 Portable Library VB projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-    \r
-    <PropertyGroup>\r
-        <!-- Embed the runtime because it is not supported on every downlevel platform -->\r
-        <VBRuntime>Embed</VBRuntime>\r
-        <NoConfig>true</NoConfig>\r
-        <MyType>Empty</MyType>\r
-    </PropertyGroup>\r
-\r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-  \r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.CSharp.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.CSharp.targets
deleted file mode 100755 (executable)
index e5ecdd7..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.CSharp.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.CSharp.targets\r
-\r
-Contains common properties and targets that are shared by all v4.5 Portable Library C# projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-    \r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-  \r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets
deleted file mode 100755 (executable)
index 4aa142b..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Common.targets\r
-\r
-Contains common properties that are shared by all v4.5 Portable Library projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  \r
-    <Import Project="..\Microsoft.Portable.Core.props" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets
deleted file mode 100755 (executable)
index 97d9ea0..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.VisualBasic.targets\r
-\r
-Contains common properties and targets that are shared by all v4.5 Portable Library VB projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <PropertyGroup>\r
-        <NoConfig>true</NoConfig>\r
-        <MyType>Empty</MyType>\r
-    </PropertyGroup>\r
-\r
-    <!-- Turns on VB runtime embedding if not already set and Microsoft.VisualBasic.dll does not exist in the target framework -->\r
-    <Target\r
-        Name="GetVBRuntime"\r
-        BeforeTargets="CoreCompile"\r
-        Condition="'$(VBRuntime)' == ''">\r
-\r
-        <ItemGroup>\r
-            <!-- Turn TargetFrameworkDirectory (which is a property with one or more directories) into an item -->\r
-            <_VBRuntimeSearchDirectories Include="$(TargetFrameworkDirectory)" />\r
-        </ItemGroup>\r
-\r
-        <PropertyGroup>\r
-            <_VBRuntimeFound Condition="Exists('%(_VBRuntimeSearchDirectories.Identity)Microsoft.VisualBasic.dll')">true</_VBRuntimeFound>\r
-        </PropertyGroup>\r
-\r
-        <PropertyGroup Condition="$(_VBRuntimeFound) != 'true'">\r
-            <VBRuntime>Embed</VBRuntime>\r
-        </PropertyGroup>\r
-    </Target>\r
-\r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.CSharp.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.CSharp.targets
deleted file mode 100755 (executable)
index c3f76e1..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.CSharp.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.CSharp.targets\r
-\r
-Contains common properties and targets that are shared by all v4.5 Portable Library C# projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-    <PropertyGroup>\r
-        <PortableEnableXamlTargets>true</PortableEnableXamlTargets>\r
-    </PropertyGroup>\r
-    \r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-  \r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.Common.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.Common.targets
deleted file mode 100755 (executable)
index 4aa142b..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.Common.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Common.targets\r
-\r
-Contains common properties that are shared by all v4.5 Portable Library projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  \r
-    <Import Project="..\Microsoft.Portable.Core.props" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.VisualBasic.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.VisualBasic.targets
deleted file mode 100755 (executable)
index 3804d78..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v4.6/Microsoft.Portable.VisualBasic.targets
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.VisualBasic.targets\r
-\r
-Contains common properties and targets that are shared by all v4.5 Portable Library VB projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <PropertyGroup>\r
-        <NoConfig>true</NoConfig>\r
-        <MyType>Empty</MyType>\r
-    </PropertyGroup>\r
-\r
-    <!-- Turns on VB runtime embedding if not already set and Microsoft.VisualBasic.dll does not exist in the target framework -->\r
-    <Target\r
-        Name="GetVBRuntime"\r
-        BeforeTargets="CoreCompile"\r
-        Condition="'$(VBRuntime)' == ''">\r
-\r
-        <ItemGroup>\r
-            <!-- Turn TargetFrameworkDirectory (which is a property with one or more directories) into an item -->\r
-            <_VBRuntimeSearchDirectories Include="$(TargetFrameworkDirectory)" />\r
-        </ItemGroup>\r
-\r
-        <PropertyGroup>\r
-            <_VBRuntimeFound Condition="Exists('%(_VBRuntimeSearchDirectories.Identity)Microsoft.VisualBasic.dll')">true</_VBRuntimeFound>\r
-        </PropertyGroup>\r
-\r
-        <PropertyGroup Condition="$(_VBRuntimeFound) != 'true'">\r
-            <VBRuntime>Embed</VBRuntime>\r
-        </PropertyGroup>\r
-    </Target>\r
-\r
-    <PropertyGroup>\r
-        <PortableEnableXamlTargets>true</PortableEnableXamlTargets>\r
-    </PropertyGroup>\r
-\r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.CSharp.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.CSharp.targets
deleted file mode 100755 (executable)
index 1afd014..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.CSharp.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.CSharp.targets\r
-\r
-Contains common properties and targets that are shared by all v5.0 Portable Library C# projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-    <PropertyGroup>\r
-        <PortableEnableXamlTargets>true</PortableEnableXamlTargets>\r
-    </PropertyGroup>\r
-    \r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-  \r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.Common.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.Common.targets
deleted file mode 100755 (executable)
index 5437ec6..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.Common.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.Common.targets\r
-\r
-Contains common properties that are shared by all v5.0 Portable Library projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-    <PropertyGroup>\r
-        <PortableNuGetMode>true</PortableNuGetMode>\r
-        <NoStdLib>true</NoStdLib>\r
-        <NuGetTargetMoniker>.NETPlatform,Version=v5.0</NuGetTargetMoniker>\r
-    </PropertyGroup>\r
-    <Import Project="..\Microsoft.Portable.Core.props" />\r
-\r
-</Project>\r

diff --git a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.VisualBasic.targets b/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.VisualBasic.targets
deleted file mode 100755 (executable)
index 9b2d0b3..0000000
--- a/dotnet/sdk/2.0.0/Microsoft/Portable/v5.0/Microsoft.Portable.VisualBasic.targets
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--\r
-***********************************************************************************************\r
-Microsoft.Portable.VisualBasic.targets\r
-\r
-Contains common properties and targets that are shared by all v5.0 Portable Library VB projects.\r
-\r
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have\r
-          created a backup copy.  Incorrect changes to this file will make it\r
-          impossible to load or build your projects from the command-line or the IDE.\r
-\r
-Copyright (C) Microsoft Corporation. All rights reserved.\r
-***********************************************************************************************\r
--->\r
-\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-\r
-    <PropertyGroup>\r
-        <NoConfig>true</NoConfig>\r
-        <MyType>Empty</MyType>\r
-    </PropertyGroup>\r
-\r
-    <!-- NuGet should add the VB Runtime -->\r
-\r
-    <PropertyGroup>\r
-        <PortableEnableXamlTargets>true</PortableEnableXamlTargets>\r
-    </PropertyGroup>\r
-\r
-    <Import Project="Microsoft.Portable.Common.targets" />\r
-    <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />\r
-    <Import Project="..\Microsoft.Portable.Core.targets" />\r
-\r
-</Project>\r