Renaming Microsoft.Framework.* -> Microsoft.Extensions.*
This commit is contained in:
Родитель
c726074485
Коммит
cff1b1bc23
|
@ -1,4 +1,4 @@
|
|||
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
|
@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B66E199-1AF
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D75011A4-DEEE-48DE-BB83-CE042F2AC05B}"
|
||||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.TelemetryAdapter", "src\Microsoft.Framework.TelemetryAdapter\Microsoft.Framework.TelemetryAdapter.xproj", "{87808F3C-362E-4261-AA4A-EE40BA39D64E}"
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.TelemetryAdapter", "src\Microsoft.Extensions.TelemetryAdapter\Microsoft.Extensions.TelemetryAdapter.xproj", "{87808F3C-362E-4261-AA4A-EE40BA39D64E}"
|
||||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.TelemetryAdapter.Test", "test\Microsoft.Framework.TelemetryAdapter.Test\Microsoft.Framework.TelemetryAdapter.Test.xproj", "{FB993EEE-FF13-4454-BF49-F60DD0A531F7}"
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.TelemetryAdapter.Test", "test\Microsoft.Extensions.TelemetryAdapter.Test\Microsoft.Extensions.TelemetryAdapter.Test.xproj", "{FB993EEE-FF13-4454-BF49-F60DD0A531F7}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
"StrictSemanticVersionValidationRule"
|
||||
],
|
||||
"packages": {
|
||||
"Microsoft.Framework.TelemetryAdapter": { }
|
||||
"Microsoft.Extensions.TelemetryAdapter": { }
|
||||
}
|
||||
},
|
||||
"Default": { // Rules to run for packages not listed in any other set.
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public interface ITelemetrySourceMethodAdapter
|
||||
{
|
|
@ -1,11 +1,11 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public static class ProxyAssembly
|
||||
{
|
||||
|
@ -16,11 +16,11 @@ namespace Microsoft.Framework.TelemetryAdapter.Internal
|
|||
|
||||
static ProxyAssembly()
|
||||
{
|
||||
var assemblyName = new AssemblyName("Microsoft.Framework.TelemetryAdapter.ProxyAssembly");
|
||||
var assemblyName = new AssemblyName("Microsoft.Extensions.TelemetryAdapter.ProxyAssembly");
|
||||
var access = AssemblyBuilderAccess.Run;
|
||||
|
||||
AssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, access);
|
||||
ModuleBuilder = AssemblyBuilder.DefineDynamicModule("Microsoft.Framework.TelemetryAdapter.ProxyAssembly.dll");
|
||||
ModuleBuilder = AssemblyBuilder.DefineDynamicModule("Microsoft.Extensions.TelemetryAdapter.ProxyAssembly.dll");
|
||||
}
|
||||
|
||||
public static TypeBuilder DefineType(
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public abstract class ProxyBase
|
||||
{
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyBase<T> : ProxyBase where T : class
|
||||
{
|
|
@ -1,11 +1,11 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyEnumerable<TSourceElement, TTargetElement> : IEnumerable<TTargetElement>
|
||||
{
|
|
@ -1,11 +1,11 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyList<TSourceElement, TTargetElement> : IReadOnlyList<TTargetElement>
|
||||
{
|
|
@ -1,11 +1,11 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public static class ProxyMethodEmitter
|
||||
{
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyTypeCache : ConcurrentDictionary<Tuple<Type, Type>, ProxyTypeCacheResult>
|
||||
{
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyTypeCacheResult
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
@ -8,7 +8,7 @@ using System.Linq;
|
|||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public static class ProxyTypeEmitter
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
||||
|
@ -7,7 +7,7 @@
|
|||
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>87808f3c-362e-4261-aa4a-ee40ba39d64e</ProjectGuid>
|
||||
<RootNamespace>Microsoft.Framework.TelemetryAdapter</RootNamespace>
|
||||
<RootNamespace>Microsoft.Extensions.TelemetryAdapter</RootNamespace>
|
||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
||||
</PropertyGroup>
|
|
@ -1,5 +1,5 @@
|
|||
// <auto-generated />
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
using System.Globalization;
|
||||
using System.Reflection;
|
||||
|
@ -8,7 +8,7 @@ namespace Microsoft.Framework.TelemetryAdapter
|
|||
internal static class Resources
|
||||
{
|
||||
private static readonly ResourceManager _resourceManager
|
||||
= new ResourceManager("Microsoft.Framework.TelemetryAdapter.Resources", typeof(Resources).GetTypeInfo().Assembly);
|
||||
= new ResourceManager("Microsoft.Extensions.TelemetryAdapter.Resources", typeof(Resources).GetTypeInfo().Assembly);
|
||||
|
||||
/// <summary>
|
||||
/// The property '{0}' on type '{1}' must define a getter to support proxy generation.
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public class ProxyTelemetrySourceMethodAdapter : ITelemetrySourceMethodAdapter
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using Microsoft.Framework.TelemetryAdapter;
|
||||
using Microsoft.Extensions.TelemetryAdapter;
|
||||
|
||||
namespace System.Diagnostics.Tracing
|
||||
{
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public class TelemetryNameAttribute : Attribute
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
@ -7,7 +7,7 @@ using System.Collections.Generic;
|
|||
using System.Diagnostics;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public class TelemetrySourceAdapter : IObserver<KeyValuePair<string, object>>
|
||||
{
|
|
@ -2,7 +2,7 @@
|
|||
"version": "1.0.0-*",
|
||||
"description": "An TelemetryListener implementation which provides duck-typing through generated proxy types.",
|
||||
"dependencies": {
|
||||
"Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*",
|
||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
|
||||
"System.Diagnostics.Tracing.Telemetry": "4.0.0-beta-*"
|
||||
},
|
||||
"compilationOptions": {
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
@ -7,7 +7,7 @@ using System.Linq;
|
|||
using Microsoft.AspNet.Testing.xunit;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter.Internal
|
||||
namespace Microsoft.Extensions.TelemetryAdapter.Internal
|
||||
{
|
||||
public class ProxyTypeEmitterTest
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
||||
|
@ -7,7 +7,7 @@
|
|||
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>fb993eee-ff13-4454-bf49-f60dd0a531f7</ProjectGuid>
|
||||
<RootNamespace>Microsoft.Framework.TelemetryAdapter.Test</RootNamespace>
|
||||
<RootNamespace>Microsoft.Extensions.TelemetryAdapter.Test</RootNamespace>
|
||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
||||
</PropertyGroup>
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
|
@ -6,7 +6,7 @@ using System.Linq.Expressions;
|
|||
using System.Reflection;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public class ProxyTelemetrySourceMethodAdapterTest
|
||||
{
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.Framework.TelemetryAdapter
|
||||
namespace Microsoft.Extensions.TelemetryAdapter
|
||||
{
|
||||
public class TelemetrySourceAdapterTest
|
||||
{
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"Microsoft.AspNet.Testing": "1.0.0-*",
|
||||
"Microsoft.Framework.TelemetryAdapter": "1.0.0-*",
|
||||
"Microsoft.Extensions.TelemetryAdapter": "1.0.0-*",
|
||||
"xunit.runner.aspnet": "2.0.0-aspnet-*"
|
||||
},
|
||||
"compile": "../../src/Microsoft.Framework.TelemetryAdapter/ReflectionTelemetrySourceMethodAdapter.cs",
|
||||
"compile": "../../src/Microsoft.Extensions.TelemetryAdapter/ReflectionTelemetrySourceMethodAdapter.cs",
|
||||
"compilationOptions": {"define": ["TEST"]},
|
||||
"commands": {
|
||||
"run": "xunit.runner.aspnet",
|
Загрузка…
Ссылка в новой задаче