Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitabbe394

Browse files
committed
Merge branch 'master' ofhttp://github.com/Microsoft/visualfsharp into proj1
2 parentsc107a16 +3bec369 commitabbe394

File tree

923 files changed

+8563
-8241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

923 files changed

+8563
-8241
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
Copyright (c) Microsoft Corporation. All Rights Reserved.
33

4-
Licensed under the Apache License, Version 2.0.
54
See License.txt in the project root for license information.
65

76
Visual F<span>#</span>

‎License.txt‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1-
Copyright (c) Microsoft Corporation. All rights reserved.
1+
The MIT License (MIT)
22

3-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
4-
these files except in compliance with the License. You may obtain a copy of the
5-
License at
3+
Copyright (c) Microsoft Corporation.
4+
All rights reserved.
65

7-
http://www.apache.org/licenses/LICENSE-2.0
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
823

9-
Unless required by applicable law or agreed to in writing, software distributed
10-
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
specific language governing permissions and limitations under the License.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To contribute to the F# ecosystem more generally see the F# Software Foundation'
4848

4949
###License
5050

51-
This project is subject to theApache Licence, Version 2.0. A copy ofthe license can be found in[License.txt](License.txt) at the root of this repo.
51+
This project is subject to theMIT License. A copy ofthis license can be found in[License.txt](License.txt) at the root of this repo.
5252

5353

5454
##Using

‎build-everything.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved.Licensed under the Apache License, Version 2.0.See License.txt in the project root for license information.-->
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
22
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
33

44
<!-- +++++++++++++++++++++++ Project selection for building +++++++++++++++++++++++++++++++-->

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rem Copyright (c) Microsoft Corporation. All Rights Reserved.Licensed under the Apache License, Version 2.0.See License.txt in the project root for license information.
1+
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22
@if"%_echo%"==""echooff
33

44
setlocalenableDelayedExpansion

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# Copyright (c) Microsoft Corporation. All Rights Reserved.Licensed under the Apache License, Version 2.0.See License.txt in the project root for license information.
2+
# Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
33

44
# Helper function to print an error message and exit with a non-zero error code.
55
failwith () {

‎fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</Compile>-->
3939
</ItemGroup>
4040
<ItemGroup>
41-
<ProjectReferenceInclude="../FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj" />
41+
<ProjectReferenceInclude="../FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="15.0.0" />

‎fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<TargetFramework>netstandard1.6</TargetFramework>
88
<AssemblyName>FSharp.Compiler.Service</AssemblyName>
99
<DefineConstants>$(DefineConstants);BUILDING_WITH_LKG</DefineConstants>
10+
<DefineConstants>$(DefineConstants);COMPILER_PUBLIC_API</DefineConstants>
1011
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
1112
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1213
<DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved.Licensed under the Apache License, Version 2.0.See License.txt in the project root for license information.-->
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>

‎fcs/README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,35 @@ To update the version number a global replace through fcs\... is currently neede
3434

3535
To build the package use any of:
3636

37-
cd fcs
38-
build Build.NetFx
39-
build Test.NetFx
40-
build NuGet.NetFx
37+
fcs\build Build.NetFx
38+
fcs\build Test.NetFx
39+
fcs\build NuGet.NetFx
4140

42-
build Build.NetStd
43-
build Test.NetStd
44-
build NuGet.NetStd
41+
fcs\build Build.NetStd
42+
fcs\build Test.NetStd
43+
fcs\build NuGet.NetStd
4544

46-
build Build
47-
build Test
48-
build NuGet
49-
build Release
45+
fcs\build Build
46+
fcs\build Test
47+
fcs\build NuGet
48+
fcs\build Release
5049

5150
which does things like:
5251

52+
cd fcs
5353
.paket\paket.bootstrapper.exe
5454
.paket\paket.exe restore
55+
dotnet restore tools.proj
5556
packages\FAKE\tools\FAKE.exe build.fsx WhateverTarget
5657

5758
###Manual push of packages
5859

5960
Yu can push the packages if you have permissions, either automatically using``build Release`` or manually
6061

61-
cd fcs
6262
set APIKEY=...
63-
..\.nuget\nuget.exe push..\Release\FSharp.Compiler.Service.14.0.1.nupkg %APIKEY% -Source https://nuget.org-Timeout 500
64-
..\.nuget\nuget.exe push..\Release\FSharp.Compiler.Service.MSBuild.v12.14.0.1.nupkg %APIKEY% -Source https://nuget.org -Timeout 500
65-
..\.nuget\nuget.exe push..\Release\FSharp.Compiler.Service.ProjectCracker.14.0.1.nupkg %APIKEY% -Source https://nuget.org -Timeout 500
63+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.14.0.2.nupkg %APIKEY% -Source https://nuget.org
64+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.MSBuild.v12.14.0.2.nupkg %APIKEY% -Source https://nuget.org
65+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.ProjectCracker.14.0.2.nupkg %APIKEY% -Source https://nuget.org
6666

6767

6868
###Use of Paket and FAKE
@@ -78,7 +78,7 @@ Testing reuses the test files from ..\tests\service which were are also FCS test
7878

7979
###Documentation Generation
8080

81-
build GenerateDocs
81+
fcs\build GenerateDocs
8282

8383
Output is in``docs``. In the``FSharp.Compiler.Service`` repo this is checked in and hosted ashttp://fsharp.github.io/FSharp.Compiler.Service.
8484

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp