Merge pull request #73 from microsoft/benwatson

Revamp build system
microsoft · Oct 10, 2019 · ca06b11 · ca06b11
2 parents 5205a0d + 2cabf02
commit ca06b11
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 307 deletions.
diff --git a/.build/CBT/CBT.Core.dll b/.build/CBT/CBT.Core.dll
diff --git a/.build/CBT/build.props b/.build/CBT/build.props
diff --git a/.build/Local/CBTModules/packages.config b/.build/Local/CBTModules/packages.config
diff --git a/.build/Local/Extensions/before.build.props b/.build/Local/Extensions/before.build.props
diff --git a/.build/Local/Extensions/build.props b/.build/Local/Extensions/build.props
diff --git a/.build/Local/NuGet/CredentialProvider.VSS.exe b/.build/Local/NuGet/CredentialProvider.VSS.exe
diff --git a/.build/Local/NuGet/nuget.exe b/.build/Local/NuGet/nuget.exe
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/MSFT.snk b/MSFT.snk
diff --git a/Microsoft.IO.RecyclableMemoryStream.nuspec b/Microsoft.IO.RecyclableMemoryStream.nuspec
diff --git a/NuGet.config b/NuGet.config
@@ -12,11 +12,6 @@
   </activePackageSource>
   <packageSources>
     <clear />
-    <add
-      key="CBT"
-      value="https://www.myget.org/F/cbt/api/v3/index.json" 
-    />
-
     <add
       key="OSS_All"
       value="https://api.nuget.org/v3/index.json" 

diff --git a/dirs.proj b/dirs.proj
diff --git a/src/Microsoft.IO.RecyclableMemoryStream.csproj b/src/Microsoft.IO.RecyclableMemoryStream.csproj
@@ -2,11 +2,26 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.4;netstandard2.1;net40;net45;net46;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <!-- NuGet properties -->
+    <PackageId>Microsoft.IO.RecyclableMemoryStream</PackageId>
+    <PackageVersion>1.3.0</PackageVersion>
+    <Title>Microsoft.IO.RecyclableMemoryStream</Title>
+    <Authors>Ben Watson; Chip Locke</Authors>
+    <Description>Pooled memory allocator.</Description>
+    <Copyright>Copyright 2015-2019 Microsoft</Copyright>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReleaseNotes>Additional framework targets, better .Net Core support, simplified build.</PackageReleaseNotes>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageTags>MemoryStream;Memory;performance;GC</PackageTags>
+    <RepositoryUrl>https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream</RepositoryUrl>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
   </PropertyGroup>
   <!-- for assembly signing we use a magic variable coupled with a special build definition which skips UTs -->
-  <PropertyGroup Condition="'$(DelaySignKeyFile)' != ''">
+  <PropertyGroup Condition="'$(SignedBuild)' == 'true'">
     <DefineConstants>$(DefineConstants);NOFRIENDASSEMBLY</DefineConstants>
-    <AssemblyOriginatorKeyFile>$(DelaySignKeyFile)</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\MSFT.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>