Change Connector package name to ConnectorBase

This commit is contained in:
Dave Tillman 2017-12-16 10:43:02 -07:00
Родитель 57b578a8dc
Коммит 43cc2bcf88
144 изменённых файлов: 55 добавлений и 57 удалений

Просмотреть файл

@ -1,15 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2003
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9BB0395E-B595-4B95-89ED-F55AF12B4EE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.Connector", "src\Steeltoe.CloudFoundry.Connector\Steeltoe.CloudFoundry.Connector.csproj", "{FC54181A-619A-43F0-989B-85999E750CC6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.Connector.Test", "test\Steeltoe.CloudFoundry.Connector.Test\Steeltoe.CloudFoundry.Connector.Test.csproj", "{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3EDCF15E-882C-4AF9-91C6-9A28F2506ACC}"
ProjectSection(SolutionItems) = preProject
config\nuget-dev.config = config\nuget-dev.config
@ -52,6 +48,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.Conne
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.Connector.EF6Core.Test", "test\Steeltoe.CloudFoundry.Connector.EF6Core.Test\Steeltoe.CloudFoundry.Connector.EF6Core.Test.csproj", "{D7296042-50AA-4570-BD5F-15DEAD416EDF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.ConnectorBase", "src\Steeltoe.CloudFoundry.ConnectorBase\Steeltoe.CloudFoundry.ConnectorBase.csproj", "{F9A2807C-292F-49EB-B23A-FBB04527BA5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.CloudFoundry.ConnectorBase.Test", "test\Steeltoe.CloudFoundry.ConnectorBase.Test\Steeltoe.CloudFoundry.ConnectorBase.Test.csproj", "{B40DE919-FBC0-4CC6-B36F-98364FCA4203}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -62,30 +62,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|x64.ActiveCfg = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|x64.Build.0 = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|x86.ActiveCfg = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Debug|x86.Build.0 = Debug|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|Any CPU.Build.0 = Release|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|x64.ActiveCfg = Release|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|x64.Build.0 = Release|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|x86.ActiveCfg = Release|Any CPU
{FC54181A-619A-43F0-989B-85999E750CC6}.Release|x86.Build.0 = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|x64.ActiveCfg = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|x64.Build.0 = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|x86.ActiveCfg = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Debug|x86.Build.0 = Debug|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|Any CPU.Build.0 = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|x64.ActiveCfg = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|x64.Build.0 = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|x86.ActiveCfg = Release|Any CPU
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2}.Release|x86.Build.0 = Release|Any CPU
{1130C00D-CE87-43A2-8723-C930D9C8891D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1130C00D-CE87-43A2-8723-C930D9C8891D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1130C00D-CE87-43A2-8723-C930D9C8891D}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -158,19 +134,43 @@ Global
{D7296042-50AA-4570-BD5F-15DEAD416EDF}.Release|x64.Build.0 = Release|Any CPU
{D7296042-50AA-4570-BD5F-15DEAD416EDF}.Release|x86.ActiveCfg = Release|Any CPU
{D7296042-50AA-4570-BD5F-15DEAD416EDF}.Release|x86.Build.0 = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|x64.ActiveCfg = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|x64.Build.0 = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Debug|x86.Build.0 = Debug|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|Any CPU.Build.0 = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|x64.ActiveCfg = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|x64.Build.0 = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|x86.ActiveCfg = Release|Any CPU
{F9A2807C-292F-49EB-B23A-FBB04527BA5C}.Release|x86.Build.0 = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|x64.ActiveCfg = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|x64.Build.0 = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|x86.ActiveCfg = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Debug|x86.Build.0 = Debug|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|Any CPU.Build.0 = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|x64.ActiveCfg = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|x64.Build.0 = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|x86.ActiveCfg = Release|Any CPU
{B40DE919-FBC0-4CC6-B36F-98364FCA4203}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FC54181A-619A-43F0-989B-85999E750CC6} = {9BB0395E-B595-4B95-89ED-F55AF12B4EE7}
{63E64B33-4236-4FC9-A9F5-4DF9A0091CB2} = {1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}
{1130C00D-CE87-43A2-8723-C930D9C8891D} = {9BB0395E-B595-4B95-89ED-F55AF12B4EE7}
{D7BAC24F-1FCC-4941-9016-079C0C5AD25B} = {1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}
{DE66FCE9-0FB0-4079-8753-DBF55A0FE8B8} = {9BB0395E-B595-4B95-89ED-F55AF12B4EE7}
{28DBA1B5-7892-45EC-B4B9-27EF9DD59BC9} = {1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}
{43012B18-D80D-4581-A85A-80F69DBD0431} = {9BB0395E-B595-4B95-89ED-F55AF12B4EE7}
{D7296042-50AA-4570-BD5F-15DEAD416EDF} = {1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}
{F9A2807C-292F-49EB-B23A-FBB04527BA5C} = {9BB0395E-B595-4B95-89ED-F55AF12B4EE7}
{B40DE919-FBC0-4CC6-B36F-98364FCA4203} = {1CEE3AF7-DC06-4BBE-B28D-62FB1BD4A7A5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {112EBBFA-82B9-483E-B258-8611B70B3A3A}

Просмотреть файл

@ -14,8 +14,8 @@ test_script:
build_script:
- scripts\appveyor_build.cmd
artifacts:
- path: 'src\Steeltoe.CloudFoundry.Connector\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorBase\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorBase\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorCore\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorCore\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector.EF6Core\bin\Debug\*.nupkg'

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
<SteeltoeConfigVersion>2.0.0-dev-00196</SteeltoeConfigVersion>
<SteeltoeConfigVersion>2.0.0-dev-00201</SteeltoeConfigVersion>
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
<SteeltoeConfigVersion>2.0.0-master-00197</SteeltoeConfigVersion>
<SteeltoeConfigVersion>2.0.0-master-00202</SteeltoeConfigVersion>
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>

Просмотреть файл

@ -1,19 +1,19 @@
:: @ECHO OFF
:: Build packages
cd src\Steeltoe.CloudFoundry.Connector
cd src\Steeltoe.CloudFoundry.ConnectorBase
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.Connector.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg" -Source "%USERPROFILE%\localfeed"
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg" -Source "%USERPROFILE%\localfeed"
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.Connector.%STEELTOE_VERSION%.nupkg" -Source "%USERPROFILE%\localfeed"
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%.nupkg" -Source "%USERPROFILE%\localfeed"
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (nuget add bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.Connector.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg -Source %USERPROFILE%\localfeed)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (nuget add bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg -Source %USERPROFILE%\localfeed)
cd ..\..
cd src\Steeltoe.CloudFoundry.Connector.EFCore

Просмотреть файл

@ -1,7 +1,7 @@
@ECHO OFF
:: Run unit tests
cd test\Steeltoe.CloudFoundry.Connector.Test
cd test\Steeltoe.CloudFoundry.ConnectorBase.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure

Просмотреть файл

@ -3,7 +3,7 @@
echo Code is built in Unit Tests
cd src/Steeltoe.CloudFoundry.Connector
cd src/Steeltoe.CloudFoundry.ConnectorBase
dotnet restore --configfile ../../nuget.config
cd ../..

Просмотреть файл

@ -1,7 +1,7 @@
#!/bin/bash
# Run unit tests
cd test/Steeltoe.CloudFoundry.Connector.Test
cd test/Steeltoe.CloudFoundry.ConnectorBase.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi

Просмотреть файл

@ -31,11 +31,11 @@
</PropertyGroup>
<ItemGroup Condition="'$(CI_BUILD)' == ''">
<ProjectReference Include="..\Steeltoe.CloudFoundry.Connector\Steeltoe.CloudFoundry.Connector.csproj" />
<ProjectReference Include="..\Steeltoe.CloudFoundry.ConnectorBase\Steeltoe.CloudFoundry.ConnectorBase.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(CI_BUILD)' == 'True'">
<PackageReference Include="Steeltoe.CloudFoundry.Connector" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
<PackageReference Include="Steeltoe.CloudFoundry.ConnectorBase" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json">

Просмотреть файл

@ -32,11 +32,11 @@
</PropertyGroup>
<ItemGroup Condition="'$(CI_BUILD)' == ''">
<ProjectReference Include="..\Steeltoe.CloudFoundry.Connector\Steeltoe.CloudFoundry.Connector.csproj" />
<ProjectReference Include="..\Steeltoe.CloudFoundry.ConnectorBase\Steeltoe.CloudFoundry.ConnectorBase.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(CI_BUILD)' == 'True'">
<PackageReference Include="Steeltoe.CloudFoundry.Connector" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
<PackageReference Include="Steeltoe.CloudFoundry.ConnectorBase" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -14,5 +14,5 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Steeltoe.CloudFoundry.Connector.Test")]
[assembly: InternalsVisibleTo("Steeltoe.CloudFoundry.ConnectorBase.Test")]
[assembly: InternalsVisibleTo("Steeltoe.CloudFoundry.Connector.EF6Core.Test")]

Просмотреть файл

@ -13,4 +13,5 @@ This project contains base types used in creating Steeltoe Connectors for CloudF
[Release or Release Candidate feed](https://www.nuget.org/) - https://www.nuget.org/
## Usage
You typically will not use the types in this package directly in an application. Normally, you would use these types when you are building a new Connector for CloudFoundry.

Просмотреть файл

@ -6,8 +6,8 @@
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<Authors>Pivotal;dtillman</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>Steeltoe.CloudFoundry.Connector</AssemblyName>
<PackageId>Steeltoe.CloudFoundry.Connector</PackageId>
<AssemblyName>Steeltoe.CloudFoundry.ConnectorBase</AssemblyName>
<PackageId>Steeltoe.CloudFoundry.ConnectorBase</PackageId>
<PackageTags>CloudFoundry;Connectors</PackageTags>
<PackageIconUrl>https://steeltoe.io/images/transparent.png</PackageIconUrl>
<PackageProjectUrl>https://steeltoe.io</PackageProjectUrl>
@ -15,7 +15,7 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.CloudFoundry.Connector.xml</DocumentationFile>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.CloudFoundry.ConnectorBase.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Steeltoe.Extensions.Configuration.CloudFoundry" Version="$(SteeltoeConfigVersion)" />
<PackageReference Include="Steeltoe.Extensions.Configuration.CloudFoundryBase" Version="$(SteeltoeConfigVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>

Просмотреть файл

@ -33,11 +33,11 @@
</PropertyGroup>
<ItemGroup Condition="'$(CI_BUILD)' == ''">
<ProjectReference Include="..\Steeltoe.CloudFoundry.Connector\Steeltoe.CloudFoundry.Connector.csproj" />
<ProjectReference Include="..\Steeltoe.CloudFoundry.ConnectorBase\Steeltoe.CloudFoundry.ConnectorBase.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(CI_BUILD)' == 'True'">
<PackageReference Include="Steeltoe.CloudFoundry.Connector" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
<PackageReference Include="Steeltoe.CloudFoundry.ConnectorBase" Version="$(SteeltoeVersion)$(SteeltoeVersionSuffix)" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -47,8 +47,5 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше