Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric St. John <ericstj@microsoft.com>2016-10-04 22:37:01 +0300
committerEric StJohn <ericstj@microsoft.com>2016-10-07 19:18:57 +0300
commitcd17e98cc1b521d97047893dd7d14344c250341c (patch)
treee77232df07e4edeb31830fe4b7d6d2aabb16529f /pkg/baseline
parentac43f1c56696a925f675715331ac0678781d83ec (diff)
Make PKGProj's restore the baseline project.json
PKGProj build depends on harvesting dlls from previously shipped packages. Rather than force every package in the repo to declare the version of the last-shipped package in project.json we have a central copy listing everything. The problem here is that if this project isn't restored we'll just silently drop assets from the package, which can cause tests to fail or package build to fail validation. This also causes a problem for folks that want to just sync the repo and build a single project without doing a full restore. To ensure that we'll always have the baseline restored I set this as the ProjectJson for the pkgproj and ensure that we run restore during package build.
Diffstat (limited to 'pkg/baseline')
-rw-r--r--pkg/baseline/baseline.props8
-rw-r--r--pkg/baseline/project.json246
2 files changed, 254 insertions, 0 deletions
diff --git a/pkg/baseline/baseline.props b/pkg/baseline/baseline.props
index 889bff59f0..5dd2fb0844 100644
--- a/pkg/baseline/baseline.props
+++ b/pkg/baseline/baseline.props
@@ -5,5 +5,13 @@
<!-- Set PackageIndexFile to point to our local repo's index. This tells the packaging targets
which index should be used for updates -->
<PackageIndexFile>$(MSBuildThisFileDirectory)..\Microsoft.Private.PackageBaseline\packageIndex.json</PackageIndexFile>
+
+ <!-- set the project.json file for pkgproj's to point to the project.json in this directory
+ to ensure that PKGProjs will restore harvested packages. -->
+ <ProjectJson>$(MSBuildThisFileDirectory)\project.json</ProjectJson>
+ <ProjectLockJson>$(MSBuildThisFileDirectory)\project.lock.json</ProjectLockJson>
</PropertyGroup>
+
+ <!-- make RestorePackages run before HarvestStablePackage to ensure we'll restore the baseline before harvesting -->
+ <Target Name="EnsureRestore" BeforeTargets="HarvestStablePackage" DependsOnTargets="RestorePackages" />
</Project>
diff --git a/pkg/baseline/project.json b/pkg/baseline/project.json
new file mode 100644
index 0000000000..dfcf0e3615
--- /dev/null
+++ b/pkg/baseline/project.json
@@ -0,0 +1,246 @@
+{
+ "frameworks": {
+ "netstandard1.6": {
+ "dependencies": {
+ "Microsoft.CSharp": "4.0.1",
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.2",
+ "Microsoft.VisualBasic": "10.0.1",
+ "Microsoft.Win32.Primitives": "4.0.1",
+ "Microsoft.Win32.Registry": "4.0.0",
+ "Microsoft.Win32.Registry.AccessControl": "4.0.0",
+ "NETStandard.Library": "1.6.0",
+ "runtime.any.System.Collections": "4.0.11",
+ "runtime.any.System.Diagnostics.Tools": "4.0.1",
+ "runtime.any.System.Diagnostics.Tracing": "4.1.0",
+ "runtime.any.System.Globalization": "4.0.11",
+ "runtime.any.System.Globalization.Calendars": "4.0.1",
+ "runtime.any.System.IO": "4.1.0",
+ "runtime.any.System.Reflection": "4.1.0",
+ "runtime.any.System.Reflection.Extensions": "4.0.1",
+ "runtime.any.System.Reflection.Primitives": "4.0.1",
+ "runtime.any.System.Resources.ResourceManager": "4.0.1",
+ "runtime.any.System.Runtime": "4.1.0",
+ "runtime.any.System.Runtime.Handles": "4.0.1",
+ "runtime.any.System.Runtime.InteropServices": "4.1.0",
+ "runtime.any.System.Text.Encoding": "4.0.11",
+ "runtime.any.System.Text.Encoding.Extensions": "4.0.11",
+ "runtime.any.System.Threading.Tasks": "4.0.11",
+ "runtime.any.System.Threading.Timer": "4.0.1",
+ "runtime.aot.System.Collections": "4.0.10",
+ "runtime.aot.System.Diagnostics.Tools": "4.0.1",
+ "runtime.aot.System.Diagnostics.Tracing": "4.0.20",
+ "runtime.aot.System.Globalization": "4.0.11",
+ "runtime.aot.System.Globalization.Calendars": "4.0.1",
+ "runtime.aot.System.IO": "4.1.0",
+ "runtime.aot.System.Reflection": "4.0.10",
+ "runtime.aot.System.Reflection.Extensions": "4.0.0",
+ "runtime.aot.System.Reflection.Primitives": "4.0.0",
+ "runtime.aot.System.Resources.ResourceManager": "4.0.0",
+ "runtime.aot.System.Runtime": "4.0.20",
+ "runtime.aot.System.Runtime.Handles": "4.0.1",
+ "runtime.aot.System.Runtime.InteropServices": "4.0.20",
+ "runtime.aot.System.Text.Encoding": "4.0.11",
+ "runtime.aot.System.Text.Encoding.Extensions": "4.0.11",
+ "runtime.aot.System.Threading.Tasks": "4.0.11",
+ "runtime.aot.System.Threading.Timer": "4.0.1",
+ "runtime.debian.8-x64.runtime.native.System": "1.0.1",
+ "runtime.debian.8-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.debian.8-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.debian.8-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.debian.8-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.fedora.23-x64.runtime.native.System": "1.0.1",
+ "runtime.fedora.23-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.fedora.23-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.fedora.23-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.native.System": "4.0.0",
+ "runtime.native.System.Data.SqlClient.sni": "4.0.0",
+ "runtime.native.System.IO.Compression": "4.1.0",
+ "runtime.native.System.Net.Http": "4.0.1",
+ "runtime.native.System.Net.Security": "4.0.1",
+ "runtime.native.System.Security.Cryptography": "4.0.0",
+ "runtime.opensuse.13.2-x64.runtime.native.System": "1.0.1",
+ "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.osx.10.10-x64.runtime.native.System": "1.0.1",
+ "runtime.osx.10.10-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.osx.10.10-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.osx.10.10-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.rhel.7-x64.runtime.native.System": "1.0.1",
+ "runtime.rhel.7-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.rhel.7-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.rhel.7-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.ubuntu.14.04-x64.runtime.native.System": "1.0.1",
+ "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.ubuntu.16.04-x64.runtime.native.System": "1.0.1",
+ "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression": "1.0.1",
+ "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http": "1.0.1",
+ "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security": "1.0.1",
+ "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography": "1.0.1",
+ "runtime.unix.Microsoft.Win32.Primitives": "4.0.1",
+ "runtime.unix.System.Console": "4.0.0",
+ "runtime.unix.System.Diagnostics.Debug": "4.0.11",
+ "runtime.unix.System.IO.FileSystem": "4.0.1",
+ "runtime.unix.System.Net.Primitives": "4.0.11",
+ "runtime.unix.System.Net.Sockets": "4.1.0",
+ "runtime.unix.System.Private.Uri": "4.0.1",
+ "runtime.unix.System.Runtime.Extensions": "4.1.0",
+ "runtime.win.Microsoft.Win32.Primitives": "4.0.1",
+ "runtime.win.System.Console": "4.0.0",
+ "runtime.win.System.Diagnostics.Debug": "4.0.11",
+ "runtime.win.System.IO.FileSystem": "4.0.1",
+ "runtime.win.System.Net.Primitives": "4.0.11",
+ "runtime.win.System.Net.Sockets": "4.1.0",
+ "runtime.win.System.Runtime.Extensions": "4.1.0",
+ "runtime.win7.System.Private.Uri": "4.0.2",
+ "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": "4.0.1",
+ "runtime.win7-x64.runtime.native.System.IO.Compression": "4.0.1",
+ "runtime.win7-x86.runtime.native.System.Data.SqlClient.sni": "4.0.1",
+ "runtime.win7-x86.runtime.native.System.IO.Compression": "4.0.1",
+ "runtime.win8-arm.runtime.native.System.IO.Compression": "4.0.1",
+ "System.AppContext": "4.1.0",
+ "System.Buffers": "4.0.0",
+ "System.Collections": "4.0.11",
+ "System.Collections.Concurrent": "4.0.12",
+ "System.Collections.Immutable": "1.2.0",
+ "System.Collections.NonGeneric": "4.0.1",
+ "System.Collections.Specialized": "4.0.1",
+ "System.ComponentModel": "4.0.1",
+ "System.ComponentModel.Annotations": "4.1.0",
+ "System.ComponentModel.EventBasedAsync": "4.0.11",
+ "System.ComponentModel.Primitives": "4.1.0",
+ "System.ComponentModel.TypeConverter": "4.1.0",
+ "System.Console": "4.0.0",
+ "System.Data.Common": "4.1.0",
+ "System.Data.SqlClient": "4.1.0",
+ "System.Diagnostics.Contracts": "4.0.1",
+ "System.Diagnostics.Debug": "4.0.11",
+ "System.Diagnostics.DiagnosticSource": "4.0.0",
+ "System.Diagnostics.FileVersionInfo": "4.0.0",
+ "System.Diagnostics.Process": "4.1.0",
+ "System.Diagnostics.StackTrace": "4.0.2",
+ "System.Diagnostics.TextWriterTraceListener": "4.0.0",
+ "System.Diagnostics.Tools": "4.0.1",
+ "System.Diagnostics.TraceSource": "4.0.0",
+ "System.Diagnostics.Tracing": "4.1.0",
+ "System.Drawing.Primitives": "4.0.0",
+ "System.Dynamic.Runtime": "4.0.11",
+ "System.Globalization": "4.0.11",
+ "System.Globalization.Calendars": "4.0.1",
+ "System.Globalization.Extensions": "4.0.1",
+ "System.IO": "4.1.0",
+ "System.IO.Compression": "4.1.1",
+ "System.IO.Compression.ZipFile": "4.0.1",
+ "System.IO.FileSystem": "4.0.1",
+ "System.IO.FileSystem.AccessControl": "4.0.0",
+ "System.IO.FileSystem.DriveInfo": "4.0.0",
+ "System.IO.FileSystem.Primitives": "4.0.1",
+ "System.IO.FileSystem.Watcher": "4.0.0",
+ "System.IO.IsolatedStorage": "4.0.1",
+ "System.IO.MemoryMappedFiles": "4.0.0",
+ "System.IO.Packaging": "4.0.0",
+ "System.IO.Pipes": "4.0.0",
+ "System.IO.UnmanagedMemoryStream": "4.0.1",
+ "System.Linq": "4.1.0",
+ "System.Linq.Expressions": "4.1.0",
+ "System.Linq.Parallel": "4.0.1",
+ "System.Linq.Queryable": "4.0.1",
+ "System.Net.Http": "4.1.0",
+ "System.Net.Http.Rtc": "4.0.1",
+ "System.Net.Http.WinHttpHandler": "4.0.0",
+ "System.Net.NameResolution": "4.0.0",
+ "System.Net.NetworkInformation": "4.1.0",
+ "System.Net.Ping": "4.0.0",
+ "System.Net.Primitives": "4.0.11",
+ "System.Net.Requests": "4.0.11",
+ "System.Net.Security": "4.0.0",
+ "System.Net.Sockets": "4.1.0",
+ "System.Net.WebHeaderCollection": "4.0.1",
+ "System.Net.WebSockets": "4.0.0",
+ "System.Net.WebSockets.Client": "4.0.0",
+ "System.Numerics.Vectors": "4.1.1",
+ "System.ObjectModel": "4.0.12",
+ "System.Private.DataContractSerialization": "4.1.1",
+ "System.Private.Uri": "4.0.1",
+ "System.Reflection": "4.1.0",
+ "System.Reflection.Context": "4.0.1",
+ "System.Reflection.DispatchProxy": "4.0.1",
+ "System.Reflection.Emit": "4.0.1",
+ "System.Reflection.Emit.ILGeneration": "4.0.1",
+ "System.Reflection.Emit.Lightweight": "4.0.1",
+ "System.Reflection.Extensions": "4.0.1",
+ "System.Reflection.Metadata": "1.3.0",
+ "System.Reflection.Primitives": "4.0.1",
+ "System.Reflection.TypeExtensions": "4.1.0",
+ "System.Resources.Reader": "4.0.0",
+ "System.Resources.ResourceManager": "4.0.1",
+ "System.Resources.Writer": "4.0.0",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.CompilerServices.Unsafe": "4.0.0",
+ "System.Runtime.CompilerServices.VisualC": "4.0.0",
+ "System.Runtime.Extensions": "4.1.0",
+ "System.Runtime.Handles": "4.0.1",
+ "System.Runtime.InteropServices": "4.1.0",
+ "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+ "System.Runtime.InteropServices.WindowsRuntime": "4.0.1",
+ "System.Runtime.Loader": "4.0.0",
+ "System.Runtime.Numerics": "4.0.1",
+ "System.Runtime.Serialization.Json": "4.0.2",
+ "System.Runtime.Serialization.Primitives": "4.1.1",
+ "System.Runtime.Serialization.Xml": "4.1.1",
+ "System.Runtime.WindowsRuntime": "4.0.11",
+ "System.Runtime.WindowsRuntime.UI.Xaml": "4.0.1",
+ "System.Security.AccessControl": "4.0.0",
+ "System.Security.Claims": "4.0.1",
+ "System.Security.Cryptography.Algorithms": "4.2.0",
+ "System.Security.Cryptography.Cng": "4.2.0",
+ "System.Security.Cryptography.Csp": "4.0.0",
+ "System.Security.Cryptography.Encoding": "4.0.0",
+ "System.Security.Cryptography.OpenSsl": "4.0.0",
+ "System.Security.Cryptography.Pkcs": "4.0.0",
+ "System.Security.Cryptography.Primitives": "4.0.0",
+ "System.Security.Cryptography.ProtectedData": "4.0.0",
+ "System.Security.Cryptography.X509Certificates": "4.1.0",
+ "System.Security.Principal": "4.0.1",
+ "System.Security.Principal.Windows": "4.0.0",
+ "System.Security.SecureString": "4.0.0",
+ "System.ServiceProcess.ServiceController": "4.1.0",
+ "System.Text.Encoding": "4.0.11",
+ "System.Text.Encoding.CodePages": "4.0.1",
+ "System.Text.Encoding.Extensions": "4.0.11",
+ "System.Text.Encodings.Web": "4.0.0",
+ "System.Text.RegularExpressions": "4.1.0",
+ "System.Threading": "4.0.11",
+ "System.Threading.AccessControl": "4.0.0",
+ "System.Threading.Overlapped": "4.0.1",
+ "System.Threading.Tasks": "4.0.11",
+ "System.Threading.Tasks.Dataflow": "4.6.0",
+ "System.Threading.Tasks.Extensions": "4.0.0",
+ "System.Threading.Tasks.Parallel": "4.0.1",
+ "System.Threading.Thread": "4.0.0",
+ "System.Threading.ThreadPool": "4.0.10",
+ "System.Threading.Timer": "4.0.1",
+ "System.Xml.ReaderWriter": "4.0.11",
+ "System.Xml.XDocument": "4.3.0-beta-24604-02",
+ "System.Xml.XmlDocument": "4.0.1",
+ "System.Xml.XmlSerializer": "4.0.11",
+ "System.Xml.XPath": "4.0.1",
+ "System.Xml.XPath.XDocument": "4.0.1",
+ "System.Xml.XPath.XmlDocument": "4.0.1"
+ }
+ },
+ "uap10.0": {
+ "dependencies": {
+ "System.Numerics.Vectors.WindowsRuntime": "4.0.1"
+ }
+ }
+ }
+}