From c193112e1ea6253b5d211497d323a55fa8ec9ce8 Mon Sep 17 00:00:00 2001
From: "Michael C. Fanning" <mikefan@microsoft.com>
Date: Mon, 13 Aug 2018 12:30:30 -0700
Subject: [PATCH] Update nuget packages. Prepare for automated signing.

---
 CreateLayoutDirectory.cmd | 58 +++++++++++++++++++++++++++++++++++++++
 src/build.props           |  8 ++++--
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 CreateLayoutDirectory.cmd

diff --git a/CreateLayoutDirectory.cmd b/CreateLayoutDirectory.cmd
new file mode 100644
index 0000000..56243de
--- /dev/null
+++ b/CreateLayoutDirectory.cmd
@@ -0,0 +1,58 @@
+::Build NuGet packages step
+@ECHO off
+SETLOCAL
+
+set BinaryOutputDirectory=%1
+set Configuration=%2
+set Platform=%3
+
+if "%BinaryOutputDirectory%" EQU "" (
+set BinaryOutputDirectory=%~dp0bld\bin
+)
+
+if "%Configuration%" EQU "" (
+set Configuration=Release
+)
+
+if "%Platform%" EQU "" (
+set Platform=AnyCPU
+)
+
+set BinaryOutputDirectory=%BinaryOutputDirectory%\%Platform%_%Configuration%\
+set LayoutForSigningDirectory=%BinaryOutputDirectory%\..\LayoutForSigning
+
+call :CreateDirIfNotExist %LayoutForSigningDirectory%
+call :CreateDirIfNotExist %LayoutForSigningDirectory%\net461\
+call :CreateDirIfNotExist %LayoutForSigningDirectory%\netcoreapp2.0
+
+call :CopyFilesForMultitargeting Json.Schema.dll            || goto :ExitFailed
+call :CopyFilesForMultitargeting Json.Pointer.dll           || goto :ExitFailed
+call :CopyFilesForMultitargeting Json.Schema.ToDotNet.dll   || goto :ExitFailed
+call :CopyFilesForMultitargeting Json.Schema.Validation.dll || goto :ExitFailed
+
+goto :Exit
+
+:CopyFilesForMultitargeting
+echo xcopy /Y %BinaryOutputDirectory%\%~n1\netstandard2.0\%1  %LayoutForSigningDirectory%\netcoreapp2.0\
+xcopy /Y %BinaryOutputDirectory%\%~n1\netstandard2.0\Microsoft.%1  %LayoutForSigningDirectory%\netcoreapp2.0\
+if "%ERRORLEVEL%" NEQ "0" (echo %1 assembly copy failed. && goto :CopyFilesExit)
+
+echo xcopy /Y %BinaryOutputDirectory%\%~n1\net461\Microsoft.%1  %LayoutForSigningDirectory%\netcoreapp2.0\
+xcopy /Y %BinaryOutputDirectory%\%~n1\net461\Microsoft.%1  %LayoutForSigningDirectory%\netcoreapp2.0\
+if "%ERRORLEVEL%" NEQ "0" (echo %1 assembly copy failed. && goto :CopyFilesExit)
+
+
+:CopyFilesExit
+Exit /B %ERRORLEVEL%
+
+:CreateDirIfNotExist
+set dir=%~1
+if not exist %dir% (md %dir%)
+Exit /B %ERRORLEVEL%
+
+:ExitFailed
+@echo.
+@echo Create layout directory step failed.
+exit /b 1
+
+:Exit
\ No newline at end of file
diff --git a/src/build.props b/src/build.props
index 49b1aa9..74effab 100644
--- a/src/build.props
+++ b/src/build.props
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <PropertyGroup Label="AssemblyAttributes">
-    <Company Condition=" '$(Company)' == '' ">Microsoft Corporation</Company>
+    <Company Condition=" '$(Company)' == '' ">Microsoft</Company>
     <Product Condition=" '$(Product)' == '' ">JSON Schema</Product>
-    <Copyright Condition=" '$(Copyright)' == '' ">Copyright (c) Microsoft. All Rights Reserved.</Copyright>
+    <Copyright Condition=" '$(Copyright)' == '' ">© Microsoft Corporation. All rights reserved.</Copyright>
     <VersionPrefix>0.56.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
@@ -24,7 +24,7 @@
     <RootNamespace Condition=" '$(RootNamespaceOverride)' != '' ">$(RootNamespaceOverride)</RootNamespace>
     <OutputSubDir>$(Platform)_$(Configuration)</OutputSubDir>
     <IntermediateOutputPath>$(MsBuildThisFileDirectory)..\bld\obj\$(MSBuildProjectName)\$(OutputSubDir)\</IntermediateOutputPath>
-    <OutputPath>$(MsBuildThisFileDirectory)..\bld\bin\$(MSBuildProjectName)\$(OutputSubDir)\</OutputPath>
+    <OutputPath>$(MsBuildThisFileDirectory)..\bld\bin\$(OutputSubDir)\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Label="Signing">
@@ -35,9 +35,11 @@
   <PropertyGroup Label="Package">
     <PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId>
     <Authors Condition=" '$(Authors)' == '' ">$(Company)</Authors>
+    <Owners Condition=" '$(Authors)' == '' ">$(Company),tse-securitytools</Owners>
     <PackageRequireLicenseAcceptance Condition=" '$(PackageRequireLicenseAcceptance)' == '' ">false</PackageRequireLicenseAcceptance>
     <PackageLicenseUrl>https://github.com/Microsoft/jschema/blob/master/License.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/Microsoft/jschema</PackageProjectUrl>
+    <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=2009431</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>