Remove functions binding version from csproj and add function sdk to sample (#259)

* Remove version from csproj

* Add functions sdk in functions sample

* Update nuget.config
This commit is contained in:
Anca Antochi 2018-09-11 16:44:21 -07:00 коммит произвёл GitHub
Родитель 45bac36450
Коммит 8a0f18ab2c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 11 добавлений и 49 удалений

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

@ -161,11 +161,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EdgeHubTrigger-CSharp", "Ed
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeHubTriggerCSharp", "edge-modules\functions\samples\EdgeHubTrigger-Csharp\EdgeHubTriggerCSharp.csproj", "{B8D5312A-B37B-4FA3-8B80-2D1A93077DDF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bin", "bin", "{3A879277-5A61-4A6A-BB27-5281FA83B1D3}"
ProjectSection(SolutionItems) = preProject
edge-modules\functions\samples\bin\extensions.json = edge-modules\functions\samples\bin\extensions.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Edge.Hub.Service.Test", "edge-hub\test\Microsoft.Azure.Devices.Edge.Hub.Service.Test\Microsoft.Azure.Devices.Edge.Hub.Service.Test.csproj", "{9BED8F14-63E9-4B4B-88F7-659D5E522CBD}"
EndProject
Global
@ -490,7 +485,6 @@ Global
{0D5C5996-7414-47D2-AF0F-C68E0E3F3AA4} = {1ABF19EE-7689-4EE3-A099-16111A8F16F4}
{C3BDC9FA-B7D8-44F3-970F-D24281335F46} = {33B7755E-D6F9-4F9B-86A8-5DFE9FEE674E}
{B8D5312A-B37B-4FA3-8B80-2D1A93077DDF} = {C3BDC9FA-B7D8-44F3-970F-D24281335F46}
{3A879277-5A61-4A6A-BB27-5281FA83B1D3} = {33B7755E-D6F9-4F9B-86A8-5DFE9FEE674E}
{9BED8F14-63E9-4B4B-88F7-659D5E522CBD} = {63969606-14B2-4D9D-AB72-A5D60D22037C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

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

@ -6,11 +6,9 @@
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<Configurations>Debug;Release;CodeCoverage</Configurations>
<HighEntropyVA>true</HighEntropyVA>
<Version>1.0.0-beta-004</Version>
</PropertyGroup>
<PropertyGroup>
<Version>1.0.0-beta-004</Version>
<Title>Microsoft Azure Edge Function extension</Title>
<Authors>Microsoft</Authors>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

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

@ -7,8 +7,16 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta7-10655" />
<Content Include="../docker*/**/*.*" CopyToPublishDirectory="Always">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Content>
<Content Include="../host.json" CopyToPublishDirectory="Always">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.19" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\binding\src\Microsoft.Azure.WebJobs.Extensions.EdgeHub\Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj" />

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

@ -1,21 +0,0 @@
{
"configurationSource": "attributes",
"bindings": [
{
"type": "edgeHubTrigger",
"name": "messageReceived",
"InputName": "input1",
"direction": "in"
},
{
"type": "edgeHub",
"name": "output",
"outputName": "alertOutput",
"batchSize": 10,
"direction": "inout"
}
],
"disabled": true,
"scriptFile": "bin/EdgeHubTriggerCSharp.dll",
"entryPoint": "Functions.Samples.EdgeHubSamples.FilterMessageAndSendMessage"
}

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

@ -1,9 +0,0 @@
{
"extensions": [
{
"Name": "EdgeHubTrigger",
"TypeName": "Microsoft.Azure.WebJobs.Extensions.EdgeHub.EdgeHubWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.EdgeHub, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null",
"HintPath": "/app/EdgeHubTrigger-Csharp/bin/Microsoft.Azure.WebJobs.Extensions.EdgeHub.dll"
}
]
}

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

@ -2,7 +2,7 @@
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="AzureAppService" value="https://www.myget.org/F/azure-appservice/api/v2" />
<add key="AzureAppService" value="https://www.myget.org/F/azure-appservice/api/v3/index.json" />
<add key="MyGetDeviceSdk" value="https://www.myget.org/F/aziot-device-sdk/api/v3/index.json" />
<add key="MyGetEdgeExtension" value="https://www.myget.org/F/aziot-edge-extension/api/v3/index.json" />
</packageSources>

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

@ -201,14 +201,6 @@ publish_leafdevice()
.
}
publish_functions_sample()
{
echo "Publishing Functions sample"
publish_files $FUNCTIONS_SAMPLE_DIR $PUBLISH_FOLDER
publish_project library "EdgeHubTriggerCSharp" netstandard2.0 $CONFIGURATION "$PUBLISH_FOLDER/samples/EdgeHubTrigger-Csharp/bin" $MSBUILD_OPTIONS
}
process_args "$@"
rm -fr $PUBLISH_FOLDER
@ -223,6 +215,7 @@ publish_app "load-gen"
publish_app "MessagesAnalyzer"
publish_lib "Microsoft.Azure.WebJobs.Extensions.EdgeHub"
publish_lib "EdgeHubTriggerCSharp"
publish_files $SRC_DOCKER_DIR $PUBLISH_FOLDER
publish_files $SRC_SCRIPTS_DIR $PUBLISH_FOLDER
@ -243,6 +236,5 @@ publish_quickstart linux-arm
publish_quickstart linux-x64
publish_leafdevice linux-arm
publish_leafdevice linux-x64
publish_functions_sample
exit $RES