Skip to content
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.

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

V2.x #644

Closed
wants to merge 55 commits into from
Closed

V2.x #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0ad6423
updating to WebJobs package 11007
brettsam Aug 22, 2017
2554104
Adding CreateIfNotExists to Cosmos DB Trigger (#278)
ealsur Aug 23, 2017
fb44191
updating WebJobs nugets
brettsam Aug 24, 2017
fd60823
updating nuspec
brettsam Aug 24, 2017
a89c934
Moving to latest WebJobs packages
mathewc Aug 29, 2017
8eebfc2
Fixing custom Table binding sample
mathewc Aug 31, 2017
9472c45
Clarify that TimerTrigger TimeSpan can't be used on Consumption plan
soninaren Aug 31, 2017
86a5fc7
Fix https://github.com/Azure/azure-webjobs-sdk-extensions/issues/273
MikeStall Aug 29, 2017
a445397
Moving to latest WebJobs SDK version
mathewc Sep 13, 2017
cdb9a94
updating nugets
brettsam Sep 15, 2017
7b68bb1
Updating WebJobs references to beta 3. Updating prerelease tag
fabiocav Sep 21, 2017
0df7f1a
Moving API Hubs prerelease tag to beta5
fabiocav Sep 21, 2017
703fc86
Updating WebJobs references and updating prerelease tags for deployment
fabiocav Sep 21, 2017
62998f7
[DocDB] removing RetryAsync and relying on DocumentClient internal re…
brettsam Sep 8, 2017
751af2b
[DocDB] Removing custom 'IfNotExists' code as DocumentClient now supp…
brettsam Sep 8, 2017
c084c36
[DocDB] improving errors when collection isn't found
brettsam Sep 8, 2017
3a526f0
updating appveyor to VS2017
brettsam Sep 8, 2017
848f30a
Fix clean for switching between core & 2.x (#303)
alrod Sep 22, 2017
72234f1
NotificationHub name property (hubName) in binding cannot be mapped t…
alrod Sep 28, 2017
fe83eba
Referencing latest SDK packages
fabiocav Sep 29, 2017
17f3b3f
Adding support for JSON string values in Cosmos DB Trigger binding
ealsur Sep 27, 2017
e635c12
Using NameResolver to lookup Trigger attributes.
ealsur Nov 7, 2017
d1ca653
Sending 400 RUs as default for collection creation
ealsur Nov 21, 2017
b05f1b8
Support DataTokens on HttpRouteFactory
mathewc Dec 13, 2017
e65b81e
Updated message to show if environment variable has been resolved for…
mhoeger Dec 12, 2017
da1ba74
updating WebJobs nugets to 11125
brettsam Jan 3, 2018
a43e42d
updating WebJobs nugets to 11129
brettsam Jan 4, 2018
bd7870d
updating WebJobs nugets
brettsam Jan 25, 2018
a9d8422
Moving to xunit version 2.3.0 (to get VS tests running again)
mathewc Jan 26, 2018
18ff1df
Moving to 2.1 SDK version and removing prerelease version
mathewc Jan 26, 2018
29c1166
Increase ApiHub extension version to beta7
mathewc Jan 26, 2018
8204d1d
Setting prerelease tag for next version
mathewc Jan 26, 2018
50ff0aa
[CosmosDBTrigger] fixing issue with NameResolver
brettsam Feb 16, 2018
8d46fc4
Adding HttpTriggerAttribute AuthorizationLevel only constructor.
BaldricS Feb 20, 2018
67157a5
HttpTriggerAttribute test updates
mathewc Mar 2, 2018
4e792e7
Upgrading Cosmos DB Change Feed Processor library to 1.1.1 and exposing
ealsur Nov 28, 2017
179aa69
improving build process
brettsam Mar 8, 2018
f240aad
Moving to latest SDK version + fixing ErrorTrigger
mathewc Mar 9, 2018
03ab27f
Removing beta tags
mathewc Mar 12, 2018
b427130
Fixing ApiHub prerelease tag
mathewc Mar 12, 2018
7d7a047
Setting prerelease tag for next version
mathewc Mar 12, 2018
740e656
TimerTrigger DST fix (#2546)
mathewc Mar 27, 2018
c5a5aa4
fixing nuget pack command
brettsam May 16, 2018
b2c3032
Exposing ConnectionMode in DocumentDBConfiguration
ealsur Mar 30, 2018
e218e80
Updating SDK package version
mathewc May 24, 2018
4493c15
Adding Connection Protocol configuration option
ealsur Jun 1, 2018
ea803e4
adding tracing, start/stop and retry
ealsur Jul 13, 2018
d14e153
Porting changes
ealsur Aug 27, 2018
5b574d8
Fixing retry scenario
ealsur Aug 29, 2018
7db7e2e
Package updates
mathewc Oct 29, 2018
ceca1da
Moving to latest SDK and removing prerelease tag
mathewc Oct 30, 2018
2318c6a
[Timer] conditionally adjust for DST
brettsam Oct 30, 2018
9a106b9
Bumping package version numbers
mathewc Oct 31, 2018
62b9a3f
Improve TimerTrigger error handling (#671) (#673)
mathewc Oct 22, 2020
f728e08
Fix for schedule monitor enablement (#674) (#680)
mathewc Nov 2, 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 CustomDictionary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<Word>DocumentDB</Word>
<Word>DocumentDBAttribute</Word>
<Word>DocumentDBConfiguration</Word>
<Word>CosmosDBTrigger</Word>
<Word>ConnectionStringSetting</Word>
<Word>MobileAppUriSetting</Word>
<Word>Twilio</Word>
Expand Down
61 changes: 59 additions & 2 deletions WebJobs.Extensions.proj
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<PublishPath>$(PublishPath)\Packages</PublishPath>
</Build>
</ItemGroup>

<UsingTask TaskName="SkipStrongNames.CheckSkipStrongNamesStatus" AssemblyFile="$(SkipStrongNamesExe)" />

<Target Name="DownloadNuGet">
Expand Down Expand Up @@ -128,7 +128,7 @@
</ItemGroup>
</Target>

<Target Name="Build" DependsOnTargets="RestorePackages;GetBinplace">
<Target Name="Build" DependsOnTargets="RestorePackages;GetBinplace;UpdateAssemblyInformationalVersion;UpdateAssemblyFileVersion">
<MSBuild Projects="@(Binplace)"
BuildInParallel="$(BuildInParallel)"/>
</Target>
Expand Down Expand Up @@ -167,6 +167,39 @@
</OfficialProjects>
</ItemGroup>
</Target>

<Target Name="UpdateAssemblyFileVersion"
Condition="'$(BuildNumber)' != ''">
<PropertyGroup>
<BuildMessage Condition="'$(BuildNumber)' != ''">build $(BuildNumber), </BuildMessage>
<CommitMessage Condition="'$(CommitHash)' != ''">$(BuildMessage)commit $(CommitHash)</CommitMessage>
</PropertyGroup>

<ItemGroup>
<AssemblyInfos Include="%(Build.RelativeDir)Properties\AssemblyInfo.cs" Condition="'%(Build.PublishType)'=='Assembly'" />
</ItemGroup>

<ReplaceFileText
FileName="%(AssemblyInfos.Identity)"
MatchExpression="(?&lt;=\[assembly: AssemblyFileVersion\(&quot;\d+.\d+.)\d+(?=.\d+&quot;\)\])"
ReplacementText="$(BuildNumber)"
LogMessage="Updating the file '%(AssemblyInfos.Identity)' to include the build number: $(BuildNumber)" />
</Target>

<Target Name="UpdateAssemblyInformationalVersion"
Condition="'$(CommitHash)' != ''">
<PropertyGroup>
<CommonAssemblyInfoFile>$(MSBuildProjectDirectory)\src\Common\CommonAssemblyInfo.cs</CommonAssemblyInfoFile>
<BuildMessage Condition="'$(BuildNumber)' != ''">build $(BuildNumber), </BuildMessage>
<CommitMessage>$(BuildMessage)commit $(CommitHash)</CommitMessage>
</PropertyGroup>

<ReplaceFileText
FileName="$(CommonAssemblyInfoFile)"
MatchExpression="(?&lt;=\[assembly: AssemblyInformationalVersion\(&quot;).*(?=&quot;\)\])"
ReplacementText="$(CommitMessage)"
LogMessage="Updating the AssemblyInformationalVersion to include: '$(CommitMessage)'" />
</Target>

<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
<ParameterGroup>
Expand Down Expand Up @@ -243,4 +276,28 @@
</Code>
</Task>
</UsingTask>

<UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<FileName ParameterType="System.String" Required="true" />
<MatchExpression ParameterType="System.String" Required="true" />
<ReplacementText ParameterType="System.String" Required="true" />
<LogMessage ParameterType="System.String" Required="false" />
</ParameterGroup>
<Task>
<Reference Include="System.Core" />
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Text.RegularExpressions" />
<Code Type="Fragment" Language="cs">
<![CDATA[
if (LogMessage != null)
{
Log.LogMessage(MessageImportance.High, LogMessage);
}
File.WriteAllText(FileName, Regex.Replace(File.ReadAllText(FileName), MatchExpression, ReplacementText));
]]>
</Code>
</Task>
</UsingTask>
</Project>
18 changes: 17 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: '{build}'
pull_requests:
do_not_increment_build_number: true
image: Visual Studio 2017
branches:
only:
- master
Expand All @@ -11,7 +12,22 @@ environment:
BUILD_NUMBER: '%APPVEYOR_BUILD_NUMBER%'
IncludeBuildNumberInVersion: 1
build_script:
- cmd: msbuild "WebJobs.Extensions.proj" /target:EnableSkipStrongNames;TestBuild /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:Buildnumber=%APPVEYOR_BUILD_NUMBER%;Configuration=Release
- cmd: IF "%APPVEYOR_REPO_TAG_NAME%"=="" SET PackageSuffixCmd=/p:PackageSuffix=-%APPVEYOR_BUILD_NUMBER%
- cmd: msbuild "WebJobs.Extensions.proj" /target:EnableSkipStrongNames;TestBuild /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:BuildNumber=%APPVEYOR_BUILD_NUMBER%;Configuration=Release %PackageSuffixCmd%
before_test:
- ps: |
# timer tests require Daylight Savings Time, so switch settings, then reset.
$originalTZ = Get-TimeZone
$env:ORIG_ID = $originalTZ.Id
Write-Host "Current TimeZone: '$originalTZ'"
Set-TimeZone -Name "Pacific Standard Time"
$currentTZ = Get-TimeZone
Write-Host "Changing TimeZone for Timer tests. Now '$currentTZ'"
after_test:
- ps: |
Set-TimeZone -Id $env:ORIG_ID
$currentTZ = Get-TimeZone
Write-Host "Changing TimeZone back to original. Now '$currentTZ'"
artifacts:
- path: bin\Packages\*.*
name: Packages
12 changes: 12 additions & 0 deletions src/Common/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: ComVisible(false)]

// The official build will insert the commit hash here.
[assembly: AssemblyInformationalVersion("")]
9 changes: 5 additions & 4 deletions src/ExtensionsSample/ExtensionsSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.3.0\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
Expand Down Expand Up @@ -333,4 +333,5 @@
<Target Name="AfterBuild">
</Target>
-->
<Import Project="..\..\tools\Clean.targets" />
</Project>
4 changes: 2 additions & 2 deletions src/ExtensionsSample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net452" />
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net45" />
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10976" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10976" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs" version="2.3.0" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.3.0" targetFramework="net46" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
Expand Down
8 changes: 7 additions & 1 deletion src/Packages/Packages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<NuGetProject Include="..\WebJobs.Extensions.SendGrid.NuGet\WebJobs.Extensions.SendGrid.nuproj">
<Link>WebJobs.Extensions.SendGrid\WebJobs.Extensions.SendGrid.nuproj</Link>
</NuGetProject>
<NuGetProject Include="..\WebJobs.Extensions.Twilio.NuGet\WebJobs.Extensions.Twilio.nuproj">
<Link>WebJobs.Extensions.Twilio\WebJobs.Extensions.Twilio.nuproj</Link>
</NuGetProject>
</ItemGroup>
<ItemGroup>
<NuGetSpec Include="..\WebJobs.Extensions.NuGet\WebJobs.Extensions.nuspec">
Expand All @@ -30,6 +33,9 @@
<NuGetSpec Include="..\WebJobs.Extensions.SendGrid.NuGet\WebJobs.Extensions.SendGrid.nuspec">
<Link>WebJobs.Extensions.SendGrid\WebJobs.Extensions.SendGrid.nuspec</Link>
</NuGetSpec>
<NuGetSpec Include="..\WebJobs.Extensions.Twilio.NuGet\WebJobs.Extensions.Twilio.nuspec">
<Link>WebJobs.Extensions.Twilio\WebJobs.Extensions.Twilio.nuspec</Link>
</NuGetSpec>
</ItemGroup>
<ItemGroup>
<NuGetProject Include="..\WebJobs.Extensions.NotificationHubs.Nuget\WebJobs.Extensions.NotificationHubs.nuproj">
Expand Down Expand Up @@ -82,7 +88,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
9 changes: 5 additions & 4 deletions src/Sample.Extension/Sample.Extension.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.3.0\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
Expand Down Expand Up @@ -189,4 +189,5 @@
<Target Name="AfterBuild">
</Target>
-->
<Import Project="..\..\tools\Clean.targets" />
</Project>
13 changes: 13 additions & 0 deletions src/Sample.Extension/SampleJobHostConfigurationExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
// Licensed under the MIT License. See License.txt in the project root for license information.

using System;
using Microsoft.Azure.WebJobs.Host.Bindings;
using Microsoft.Azure.WebJobs.Host.Config;
using Microsoft.WindowsAzure.Storage.Table;
using Sample.Extension;

namespace Microsoft.Azure.WebJobs
Expand Down Expand Up @@ -33,6 +35,17 @@ public void Initialize(ExtensionConfigContext context)
context.Config.RegisterBindingExtensions(
new SampleAttributeBindingProvider(),
new SampleTriggerAttributeBindingProvider());

IConverterManager converterManager = context.Config.GetService<IConverterManager>();
converterManager.AddConverter<CloudTable, Table<OpenType>, TableAttribute>(typeof(CustomTableBindingConverter<>));
}
}
private class CustomTableBindingConverter<T>
: IConverter<CloudTable, Table<T>>
{
public Table<T> Convert(CloudTable input)
{
return new Table<T>(input);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Sample.Extension/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10976" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10976" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs" version="2.3.0" targetFramework="net46" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.3.0" targetFramework="net46" />
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net45" />
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net45" />
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<title>Microsoft.Azure.WebJobs.Extensions.ApiHub</title>
<version>$NuGetPackageVersion$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<summary>Microsoft.Azure.WebJobs.Extensions.ApiHub adds ApiHub triggers and bindings to the WebJobs SDK.</summary>
<description>This package contains the runtime assemblies for Microsoft.Azure.WebJobs.Extensions.ApiHub. For more information, please visit https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</description>
<language>en-US</language>
<projectUrl>https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</projectUrl>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=320972</projectUrl>
<licenseUrl>$PackageEULA$</licenseUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<tags>Microsoft Azure WebJobs Jobs Extensions ApiHub windowsazureofficial Web</tags>
Expand Down
8 changes: 2 additions & 6 deletions src/WebJobs.Extensions.ApiHub/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyProduct("Microsoft Azure WebJobs SDK ApiHub Extensions")]
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

[assembly: ComVisible(false)]

[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Extensions.Tests")]
26 changes: 15 additions & 11 deletions src/WebJobs.Extensions.ApiHub/WebJobs.Extensions.ApiHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10976\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.3.0\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
Expand Down Expand Up @@ -174,6 +174,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Table\ApiHubTableAttributeExtensions.cs" />
<Compile Include="Table\TableConfigContext.cs" />
<Compile Include="Table\ConnectionFactory.cs" />
Expand Down Expand Up @@ -215,18 +218,19 @@
</CodeAnalysisDictionary>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\StyleCop.MSBuild.4.7.55.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.55.0\build\StyleCop.MSBuild.Targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.55.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.55.0\build\StyleCop.MSBuild.Targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Import Project="..\..\tools\Clean.targets" />
<Import Project="..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets'))" />
</Target>
</Project>
Loading