Skip to content

Commit 697c527

Browse files
nmetulevnmetulev
authored
Merge branch 'main' into master
2 parents f29f6c5 + 040e6ba commit 697c527

83 files changed

Lines changed: 1271 additions & 224 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.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,5 +290,6 @@ __pycache__/
290290
*.odx.cs
291291
*.xsd.cs
292292
/build/tools
293+
/build/nupkg
293294

294295
BuildResults.xml

‎ColorCode.Core/CodeColorizerBase.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using ColorCode.Compilation;
46
using ColorCode.Parsing;

‎ColorCode.Core/ColorCode.Core.csproj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,12 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard1.4</TargetFramework>
5+
<TargetFrameworks>netstandard1.4;netstandard2.0</TargetFrameworks>
66
<RootNamespace>ColorCode</RootNamespace>
77
<AssemblyName>ColorCode.Core</AssemblyName>
88
<Title>ColorCode-Universal</Title>
99
<Description>The Core Library, containing the Parser, and the classes to create your own formatter.</Description>
1010
<PackageTags>ColorCode Syntax Highlighting SyntaxHighlighting Formatting</PackageTags>
1111
</PropertyGroup>
12-
13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
14-
<DebugType>full</DebugType>
15-
<DebugSymbols>true</DebugSymbols>
16-
</PropertyGroup>
17-
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
19-
<DebugType>full</DebugType>
20-
<DebugSymbols>true</DebugSymbols>
21-
</PropertyGroup>
22-
12+
2313
</Project>

‎ColorCode.Core/Common/ExtensionMethods.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using System;
46
using System.Collections.Generic;

‎ColorCode.Core/Common/Guard.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using System;
46
using System.Collections.Generic;

‎ColorCode.Core/Common/ILanguageRepository.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using System.Collections.Generic;
46

‎ColorCode.Core/Common/LanguageId.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
namespace ColorCode.Common
46
{

‎ColorCode.Core/Common/LanguageRepository.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using System;
46
using System.Collections.Generic;

‎ColorCode.Core/Common/ScopeName.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
namespace ColorCode.Common
46
{

‎ColorCode.Core/Common/TextInsertion.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
24

35
using ColorCode.Parsing;
46

0 commit comments

Comments
 (0)