[Pkg-cli-apps-commits] [fsharp] 01/71: Cherry pick 3a1f5187baaf422a98a92001008334311827feb9 to align with base for F# 3.1 code drop
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Fri Jan 17 05:18:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to tag 3.1.0
in repository fsharp.
commit 36b04566f2557d0f9a9e3055aa9fd2449f95081e
Author: Don Syme <dsyme at microsoft.com>
Date: Fri Nov 9 00:21:07 2012 +0100
Cherry pick 3a1f5187baaf422a98a92001008334311827feb9 to align with base for F# 3.1 code drop
---
lib/bootstrap/4.0/Microsoft.FSharp-proto.targets | 2 +-
lib/bootstrap/4.0/Microsoft.FSharp.targets | 2 +-
src/absil/ilbinary.fsi | 2 +-
src/absil/zmap.fs | 2 +-
src/absil/zmap.fsi | 2 +-
src/absil/zset.fs | 2 +-
src/absil/zset.fsi | 2 +-
src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs | 2 +-
.../assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs | 2 +-
src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs | 2 +-
src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs | 2 +-
src/assemblyinfo/assemblyinfo.FSharp.Compiler.dll.fs | 2 +-
src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs | 2 +-
src/assemblyinfo/assemblyinfo.fsc.exe.fs | 2 +-
src/assemblyinfo/assemblyinfo.fsi.exe.fs | 2 +-
src/fsharp/FSharp.Build/Microsoft.FSharp.targets | 2 +-
src/fsharp/fsi/console.fs | 2 +-
src/fsharp/unittests/Tests.TypeProvidersImpl.fs | 2 +-
src/ilx/cu_erase.fsi | 2 +-
src/ilx/pubclo.fsi | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lib/bootstrap/4.0/Microsoft.FSharp-proto.targets b/lib/bootstrap/4.0/Microsoft.FSharp-proto.targets
index 474fbdc..34cd68a 100644
--- a/lib/bootstrap/4.0/Microsoft.FSharp-proto.targets
+++ b/lib/bootstrap/4.0/Microsoft.FSharp-proto.targets
@@ -11,7 +11,7 @@ For example, it contains the step that actually calls the F# compiler. The rema
of the build process is defined in Microsoft.Common.targets, which is imported by
this file.
-Copyright (C) Microsoft Corporation. All rights reserved.
+Copyright (C) Microsoft Corporation. Apache 2.0 License.
***********************************************************************************************
-->
diff --git a/lib/bootstrap/4.0/Microsoft.FSharp.targets b/lib/bootstrap/4.0/Microsoft.FSharp.targets
index 94b55ac..849be62 100644
--- a/lib/bootstrap/4.0/Microsoft.FSharp.targets
+++ b/lib/bootstrap/4.0/Microsoft.FSharp.targets
@@ -11,7 +11,7 @@ For example, it contains the step that actually calls the F# compiler. The rema
of the build process is defined in Microsoft.Common.targets, which is imported by
this file.
-Copyright (C) Microsoft Corporation. All rights reserved.
+Copyright (C) Microsoft Corporation. Apache 2.0 License.
***********************************************************************************************
-->
diff --git a/src/absil/ilbinary.fsi b/src/absil/ilbinary.fsi
index 557df60..6c20831 100755
--- a/src/absil/ilbinary.fsi
+++ b/src/absil/ilbinary.fsi
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
/// Internal use only. Code and constants shared between binary reader/writer.
module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants
diff --git a/src/absil/zmap.fs b/src/absil/zmap.fs
index d3634e9..5248c17 100755
--- a/src/absil/zmap.fs
+++ b/src/absil/zmap.fs
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
namespace Microsoft.FSharp.Compiler.AbstractIL.Internal
diff --git a/src/absil/zmap.fsi b/src/absil/zmap.fsi
index 5fa2398..0aa0fbd 100755
--- a/src/absil/zmap.fsi
+++ b/src/absil/zmap.fsi
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
namespace Microsoft.FSharp.Compiler.AbstractIL.Internal
diff --git a/src/absil/zset.fs b/src/absil/zset.fs
index 1144752..ec92ae0 100755
--- a/src/absil/zset.fs
+++ b/src/absil/zset.fs
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
namespace Microsoft.FSharp.Compiler.AbstractIL.Internal
diff --git a/src/absil/zset.fsi b/src/absil/zset.fsi
index 820b0f9..7084bc4 100755
--- a/src/absil/zset.fsi
+++ b/src/absil/zset.fsi
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
namespace Microsoft.FSharp.Compiler.AbstractIL.Internal
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs
index e5dd6a7..47ec7ad 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs
@@ -4,7 +4,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Build.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Build.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
do()
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs
index c27f387..d266cd1 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs
@@ -4,7 +4,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Compiler.Interactive.Settings.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Compiler.Interactive.Settings.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
#if NO_STRONG_NAMES
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
index 10c34ba..ba39213 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
@@ -5,7 +5,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
#if NO_STRONG_NAMES
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs
index 9a5a247..adb6de8 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs
@@ -5,7 +5,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Compiler.Silverlight.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Compiler.Silverlight.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
// Note: internals visible to unit test DLLs in Retail (and all) builds.
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.dll.fs
index d546a19..38599e7 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.dll.fs
@@ -5,7 +5,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Compiler.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Compiler.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
#if NO_STRONG_NAMES
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc")>]
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs
index 91ab96f..14f210d 100755
--- a/src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs
@@ -4,7 +4,7 @@ open System.Reflection
[<assembly:AssemblyDescription("FSharp.Core.dll")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("FSharp.Core.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
#if PORTABLE
diff --git a/src/assemblyinfo/assemblyinfo.fsc.exe.fs b/src/assemblyinfo/assemblyinfo.fsc.exe.fs
index db57e85..c323c65 100755
--- a/src/assemblyinfo/assemblyinfo.fsc.exe.fs
+++ b/src/assemblyinfo/assemblyinfo.fsc.exe.fs
@@ -4,7 +4,7 @@ open System.Reflection
[<assembly:AssemblyDescription("fsc.exe")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("fsc.exe")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
diff --git a/src/assemblyinfo/assemblyinfo.fsi.exe.fs b/src/assemblyinfo/assemblyinfo.fsi.exe.fs
index d6d028a..8c386ec 100755
--- a/src/assemblyinfo/assemblyinfo.fsi.exe.fs
+++ b/src/assemblyinfo/assemblyinfo.fsi.exe.fs
@@ -4,7 +4,7 @@ open System.Reflection
[<assembly:AssemblyDescription("fsi.exe")>]
[<assembly:AssemblyCompany("Microsoft Corporation")>]
[<assembly:AssemblyTitle("fsi.exe")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All rights reserved.")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
do()
diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets
index 00a701d..a5d2d8e 100755
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets
@@ -11,7 +11,7 @@ For example, it contains the step that actually calls the F# compiler. The rema
of the build process is defined in Microsoft.Common.targets, which is imported by
this file.
-Copyright (C) Microsoft Corporation. All rights reserved.
+Copyright (C) Microsoft Corporation. Apache 2.0 License.
***********************************************************************************************
-->
diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs
index c75906b..71282eb 100755
--- a/src/fsharp/fsi/console.fs
+++ b/src/fsharp/fsi/console.fs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. Apache 2.0 License.
namespace Microsoft.FSharp.Compiler.Interactive
diff --git a/src/fsharp/unittests/Tests.TypeProvidersImpl.fs b/src/fsharp/unittests/Tests.TypeProvidersImpl.fs
index 6aa7af5..4b71502 100755
--- a/src/fsharp/unittests/Tests.TypeProvidersImpl.fs
+++ b/src/fsharp/unittests/Tests.TypeProvidersImpl.fs
@@ -62,7 +62,7 @@ type TypeProviderImplTests() =
"Attempting to download metadata from 'http://bing.com/' using WS-Metadata Exchange or DISCO."
"Microsoft (R) Service Model Metadata Tool"
"[Microsoft (R) Windows (R) Communication Foundation, Version 4.0.30319.17360]"
- "Copyright (c) Microsoft Corporation. All rights reserved."
+ "Copyright (c) Microsoft Corporation. Apache 2.0 License."
""
""
""
diff --git a/src/ilx/cu_erase.fsi b/src/ilx/cu_erase.fsi
index 8697a13..a2c3511 100755
--- a/src/ilx/cu_erase.fsi
+++ b/src/ilx/cu_erase.fsi
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
// --------------------------------------------------------------------
// Internal use only. Erase discriminated unions.
diff --git a/src/ilx/pubclo.fsi b/src/ilx/pubclo.fsi
index ae107c3..4899fb0 100755
--- a/src/ilx/pubclo.fsi
+++ b/src/ilx/pubclo.fsi
@@ -1,4 +1,4 @@
-(* (c) Microsoft Corporation. All rights reserved *)
+(* (c) Microsoft Corporation. Apache 2.0 License *)
/// Internal use only. Erase closures
module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.EraseIlxFuncs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list