Skip to content

Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maryamariyan wants to merge 2 commits into from
Closed

Enables Microsoft.Extensions.Configuration.Json #33900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3d203
+ ref/src/pkg/test
maryamariyan Mar 21, 2020
cbf8735
simplify ref
maryamariyan Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libraries/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
<PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down
9 changes: 9 additions & 0 deletions ...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
3 changes: 3 additions & 0 deletions ...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down
8 changes: 4 additions & 4 deletions ...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<Reference Include="System.Text.Json" />
<Reference Include="System.Threading.Tasks.Extensions" />
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.
Outdated
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
}
if (string.IsNullOrEmpty(path))
{
throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
}

return builder.AddJsonFile(s =>
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
{
if (doc.RootElement.ValueKind != JsonValueKind.Object)
{
throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
}
VisitElement(doc.RootElement);
}
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
var key = _currentPath;
if (_data.ContainsKey(key))
{
throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
}
_data[key] = value.ToString();
break;

default:
throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
}
catch (JsonException e)
{
throw new FormatException(Resources.Error_JSONParseError, e);
throw new FormatException(SR.Error_JSONParseError, e);
}
}
}
Expand Down
21 changes: 13 additions & 8 deletions ...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);3021</NoWarn>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
<Reference Include="System.Memory" />
<Reference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Runtime" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Reference Include="System.Text.Json" />
<Reference Include="System.Threading.Tasks.Extensions" />
<Reference Include="netstandard" />
</ItemGroup>

</Project>
7 changes: 7 additions & 0 deletions src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
[Fact]
public void ThrowExceptionWhenPassingNullAsFilePath()
{
var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
[Fact]
public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
{
var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down
20 changes: 11 additions & 9 deletions ....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
<ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
<Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
<Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
<Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
<Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<Reference Include="Microsoft.Extensions.Configuration.Json" />
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Newtonsoft.Json" />
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
</ItemGroup>

</Project>
27 changes: 27 additions & 0 deletions src/libraries/pkg/baseline/packageIndex.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
"5.0.0.0": "5.0.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"StableVersions": [
"1.0.0",
"1.0.1",
"1.0.2",
"1.1.0",
"1.1.1",
"1.1.2",
"2.0.0",
"2.0.1",
"2.0.2",
"2.1.0",
"2.1.1",
"2.2.0",
"3.0.0",
"3.0.1",
"3.0.2",
"3.0.3",
"3.1.0",
"3.1.1",
"3.1.2"
],
"InboxOn": {},
"AssemblyVersionInPackageVersion": {
"5.0.0.0": "5.0.0"
}
},
"Microsoft.Extensions.DependencyInjection": {
"StableVersions": [
"1.0.0",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Enables Microsoft.Extensions.Configuration.Json by maryamariyan · Pull Request #33900 · dotnet/runtime · GitHub
Skip to content
Enables Microsoft.Extensions.Configuration.Json#33900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

maryamariyan
wants to merge
2
commits into

from

 Closed


Enables Microsoft.Extensions.Configuration.Json
#33900
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dd3d203

+ ref/src/pkg/test


maryamariyan Mar 21, 2020
cbf8735

simplify ref


maryamariyan Mar 22, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
src/libraries/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Json\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
 <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
Expand Down

9 changes: 9 additions & 0 deletions
...crosoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 <ItemGroup>
 <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
 <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project> 

3 changes: 3 additions & 0 deletions
...es/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// ------------------------------------------------------------------------------
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace Microsoft.Extensions.Configuration
{
Expand Down

8 changes: 4 additions & 4 deletions
...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,9 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
 <Reference Include="Microsoft.Extensions.Configuration"  />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
 <Reference Include="System.Text.Json"  />
 <Reference Include="System.Threading.Tasks.Extensions"  />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
Comment thread
maryamariyan marked this conversation as resolved.


Outdated

 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
 <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
 </ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build
 }
 if (string.IsNullOrEmpty(path))
 {
 throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path));
 throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
 }

 return builder.AddJsonFile(s =>
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ private IDictionary<string, string> ParseStream(Stream input)
 {
 if (doc.RootElement.ValueKind != JsonValueKind.Object)
 {
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind));
 }
 VisitElement(doc.RootElement);
 }
Expand DownExpand Up@@ -78,13 +78,13 @@ private void VisitValue(JsonElement value)
 var key = _currentPath;
 if (_data.ContainsKey(key))
 {
 throw new FormatException(Resources.FormatError_KeyIsDuplicated(key));
 throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key));
 }
 _data[key] = value.ToString();
 break;

 default:
 throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind));
 throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public override void Load(Stream stream)
 }
 catch (JsonException e)
 {
 throw new FormatException(Resources.Error_JSONParseError, e);
 throw new FormatException(SR.Error_JSONParseError, e);
 }
 }
 }
Expand Down

21 changes: 13 additions & 8 deletions
...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
 <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <NoWarn>$(NoWarn);3021</NoWarn>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <InternalsVisibleTo Include="Microsoft.Extensions.Configuration.Json.Tests" />
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="System.Memory" />
 <Reference Include="System.Text.Json" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
 <Reference Include="System.Collections" />
 <Reference Include="System.Linq" />
 <Reference Include="System.Runtime" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <Reference Include="System.Text.Json" />
 <Reference Include="System.Threading.Tasks.Extensions" />
 <Reference Include="netstandard" />
 </ItemGroup>

</Project>

7 changes: 7 additions & 0 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] 

4 changes: 2 additions & 2 deletions
src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing()
 [Fact]
 public void ThrowExceptionWhenPassingNullAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(path: null));

Expand All@@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath()
 [Fact]
 public void ThrowExceptionWhenPassingEmptyStringAsFilePath()
 {
 var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message;
 var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message;

 var exception = Assert.Throws<ArgumentException>(() => new ConfigurationBuilder().AddJsonFile(string.Empty));

Expand Down

20 changes: 11 additions & 9 deletions
....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,23 @@

 <PropertyGroup>
 <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
 <EnableDefaultItems>true</EnableDefaultItems>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
 <ProjectReference Include="..\..\testassets\Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj" />
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
 <Link>Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs</Link>
 </Compile>
 <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
 <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
 </Compile>
 </ItemGroup>

 <ItemGroup>
 <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
 <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
 <Reference Include="Microsoft.Extensions.Configuration.Json" />
 <Reference Include="Microsoft.Extensions.Configuration" />
 <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
 <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
 <Reference Include="Newtonsoft.Json" />
 <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
 </ItemGroup>

</Project>

27 changes: 27 additions & 0 deletions
src/libraries/pkg/baseline/packageIndex.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,33 @@
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.Configuration.Json": {
 "StableVersions": [
 "1.0.0",
 "1.0.1",
 "1.0.2",
 "1.1.0",
 "1.1.1",
 "1.1.2",
 "2.0.0",
 "2.0.1",
 "2.0.2",
 "2.1.0",
 "2.1.1",
 "2.2.0",
 "3.0.0",
 "3.0.1",
 "3.0.2",
 "3.0.3",
 "3.1.0",
 "3.1.1",
 "3.1.2"
 ],
 "InboxOn": {},
 "AssemblyVersionInPackageVersion": {
 "5.0.0.0": "5.0.0"
 }
 },
 "Microsoft.Extensions.DependencyInjection": {
 "StableVersions": [
 "1.0.0",
Expand Down