Skip to content

Commit c5794d0

Browse files
vanackerglennvanackerglenn
authored
Merge pull request #1 from gluckez/main
Main
2 parents 0bab871 + a062a24 commit c5794d0

50 files changed

Lines changed: 1338 additions & 709 deletions

File tree

Some content is hidden

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

‎.github/workflows/monodevelop.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
sudo dpkg -i packages-microsoft-prod.deb
3232
sudo apt-get install -y apt-transport-https
3333
sudo apt-get update
34-
sudo apt-get install -y dotnet-sdk-3.1
34+
sudo apt-get install -y dotnet-sdk-6.0
3535
# Install mono and msbuild
3636
sudo apt-get install -y gnupg ca-certificates
3737
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
3838
# Reference mono and msbuild from stable repo for versions 6.12.0.122 (mono) and 16.6.0.15201 (msbuild)
39-
echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
39+
# echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
4040
# Reference mono and msbuild from preview repo for versions 6.12.0.147 (mono) and 16.10.1 (msbuild)
41-
# echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list
41+
echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list
4242
sudo apt-get update
4343
# Install mono-complete and ca-certificates-mono
4444
sudo apt-get install -y mono-complete ca-certificates-mono
@@ -57,6 +57,7 @@ jobs:
5757
msbuild -version
5858
dotnet --info
5959
git config --global --add safe.directory /__w/dotdevelop/dotdevelop
60+
6061
# Checkout, configure and build
6162
- uses: actions/checkout@v3
6263
with:

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
[submodule "main/external/nrefactory"]
2222
path = main/external/nrefactory
2323
url = https://github.com/dotdevelop/NRefactory.git
24-
[submodule "main/external/nuget-binary"]
25-
path = main/external/nuget-binary
26-
url = https://github.com/dotdevelop/nuget-binary.git
27-
branch = master
2824
[submodule "main/external/sharpsvn-binary"]
2925
path = main/external/sharpsvn-binary
3026
url = https://github.com/dotdevelop/sharpsvn-binary.git

‎main/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<NuGetVersionMicrosoftTestPlatform>16.2.0</NuGetVersionMicrosoftTestPlatform>
1919
<NuGetVersionMonoDevelopAnalyzers>0.1.0.2</NuGetVersionMonoDevelopAnalyzers>
2020
<NuGetVersionNewtonsoftJson>12.0.2</NuGetVersionNewtonsoftJson>
21-
<NuGetVersionNuGet>5.4.0</NuGetVersionNuGet>
21+
<NuGetVersionNuGet>5.8.0</NuGetVersionNuGet>
2222
<NuGetVersionNUnit2>2.7.0</NuGetVersionNUnit2>
2323
<NuGetVersionNUnit3>3.9.0</NuGetVersionNUnit3>
2424
<NuGetVersionVSCodeDebugProtocol>15.8.20719.1</NuGetVersionVSCodeDebugProtocol>

‎main/external/fsharpbinding/paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version 5.201.1
22
framework: net472
3-
source https://nuget.org/api/v2/
3+
source https://api.nuget.org/v3/index.json
44

55
nuget ExtCore framework: >= net40
66
nuget FSharp.Compiler.Service 31.0.0

‎main/external/fsharpbinding/paket.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RESTRICTION: == net472
22
NUGET
3-
remote: https://www.nuget.org/api/v2
3+
remote: https://api.nuget.org/v3/index.json
44
ExtCore (0.8.46)
55
FAKE (5.8.4)
66
Fantomas (3.0.0-beta-002)

‎main/external/nuget-binary‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎main/external/nuget-binary/CODE-OF-CONDUCT.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

‎main/external/nuget-binary/Lucene.Net.dll‎

745 KB
Binary file not shown.

‎main/external/nuget-binary/Microsoft.Web.XmlTransform.dll‎

79.7 KB
Binary file not shown.

‎main/external/nuget-binary/NuGet-COPYRIGHT.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Copyright (c) .NET Foundation. All rights reserved.
2+
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
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
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.

0 commit comments

Comments
 (0)