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

Bump log4net from 1.2.10 to 2.0.10 in /samples/e2e/EventHubsCaptureEventGridDemo/DWDumper #473

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
9c355e9
draft
serkantkaraca Jun 27, 2019
037168f
Adding control plane + data plane EH sample
serkantkaraca Jun 28, 2019
37cf05a
SDK ref fixes for EH RBAC sample
serkantkaraca Jun 28, 2019
2dba515
Merge branch 'master' of https://github.com/Azure/azure-event-hubs in…
serkantkaraca Jul 1, 2019
118133b
Updates for 3.0.0 RBAC release
JamesBirdsall Jul 1, 2019
27c213b
Adding RBAC custom role sample
serkantkaraca Jul 2, 2019
51587c8
Remove unintented files
serkantkaraca Jul 2, 2019
10ec29a
Reverting unintended changes
serkantkaraca Jul 2, 2019
c030b6d
readme changes
serkantkaraca Jul 2, 2019
1306652
minor changes
serkantkaraca Jul 2, 2019
eda4dbd
Refactoring token acquisition
serkantkaraca Jul 2, 2019
4a87ed4
Update readme.md
serkantkaraca Jul 2, 2019
3337741
Update readme.md
serkantkaraca Jul 2, 2019
d47a55f
Merge pull request #446 from Azure/serkar.AddCustomRbacEhSample
serkantkaraca Jul 2, 2019
8caf262
Adding sender sample for rbac
ShubhaVijayasarathy Jul 3, 2019
edb6409
Merge pull request #445 from Azure/RBACupdates
ShubhaVijayasarathy Jul 17, 2019
9940943
Merge branch 'master' of https://github.com/Azure/azure-event-hubs in…
serkantkaraca Jul 18, 2019
23d3eaa
Moving Managed Identity sample to .NET Standard SDK
serkantkaraca Jul 18, 2019
566ef0c
Remove unintended SampleSender changes
serkantkaraca Jul 18, 2019
12583b9
Revert "Updates for Java client 3.0.0 RBAC release" (#448)
ShubhaVijayasarathy Jul 22, 2019
f335055
Merge pull request #449 from Azure/MsiSampleChanges
serkantkaraca Jul 22, 2019
ff85c7c
Move EH SDK to 4.0.0
serkantkaraca Jul 22, 2019
582fc0b
Merge pull request #451 from Azure/FixRbcSample2
serkantkaraca Jul 22, 2019
bb7a402
Remove CxCache dependency in ReliableSender sample
serkantkaraca Jul 22, 2019
526c56c
-
serkantkaraca Jul 22, 2019
a5895c7
Merge pull request #452 from Azure/RemoveCxCacheReferences
serkantkaraca Jul 22, 2019
225db71
Reorging the folder structure
ShubhaVijayasarathy Jul 22, 2019
d548f8f
adding samples to Messaging.SErviceBus
ShubhaVijayasarathy Jul 22, 2019
a35a76f
Update App.config
serkantkaraca Jul 24, 2019
5cb25d3
Moving SFProcessor sample into SDK folder
serkantkaraca Jul 25, 2019
a9876ef
Merge pull request #453 from Azure/reorg_samples
serkantkaraca Jul 25, 2019
d096ca2
Update Java samples for 3.0.0 client (#455)
JamesBirdsall Aug 29, 2019
12b87e6
Consolidate all Java RBAC sample work (#456)
JamesBirdsall Aug 29, 2019
cbc412e
updated to use the 5.0.0 SDK (#459)
spelluru Oct 23, 2019
790471f
Update samples for client 3.0.2 (#457)
JamesBirdsall Oct 23, 2019
8cf2471
updated samples used by tutorials to use the new package
spelluru Oct 30, 2019
17f6ceb
updated Anomaly Detector and Wind Turbine Data Generator samples for …
spelluru Nov 5, 2019
a4354c1
updated Anomaly Detector and WindTurbineDataGenerator samples for Pre…
spelluru Dec 5, 2019
2be764e
updated for Preview 6
spelluru Dec 6, 2019
78ec550
updated based on feedback from Serkant and Jesse
spelluru Jan 9, 2020
000b20a
minor update to UI - fully qualified name
spelluru Jan 9, 2020
40fa580
added using statements
spelluru Jan 9, 2020
284fd90
Merge pull request #463 from spelluru/newpackagesamples1029
serkantkaraca Jan 13, 2020
f4f50e8
fixed the receive code
spelluru Jan 15, 2020
f65204b
Merge pull request #464 from spelluru/fixmsi0115
spelluru Jan 16, 2020
72fc2bb
Updated samples to use the latest .NET package
spelluru Jan 30, 2020
1b66691
Merge pull request #466 from spelluru/ehubsamples0130
spelluru Feb 12, 2020
3527fe9
Add async send sample (#468)
JamesBirdsall Apr 22, 2020
7ed366d
updated the readme to point to new samples. Cleaned up too.
spelluru Apr 30, 2020
5a42971
Merge pull request #469 from spelluru/sdklinks0430
spelluru May 6, 2020
5a16c14
Updated to use Functions runtime version 3 (latest)
spelluru Jun 9, 2020
5acf9e8
removed publish profile
spelluru Jun 9, 2020
3af21a2
Merge pull request #471 from spelluru/egridintegrationsample0608
spelluru Jun 9, 2020
e9e01dd
updated to use Azure.Messaging.EventHubs 5.2 - latest stable version
spelluru Dec 8, 2020
d6bf8b1
Merge pull request #472 from spelluru/ehubegridintegration1207
serkantkaraca Dec 8, 2020
da5dd91
modified readmes to point to Track 2 content; moved files to right fo…
Mar 17, 2021
aa20765
addressed review feedback
Mar 23, 2021
8576c5e
Simplify readme for RBAC
ramya-rao-a Apr 2, 2021
719324b
Re-order steps for custom role sample for clarity
ramya-rao-a Apr 2, 2021
de8fe23
Consolidate intro and note, use quick start links
ramya-rao-a Apr 2, 2021
ca68875
Merge pull request #475 from ramya-rao-a/lily-patch
lilyjma Apr 5, 2021
f471963
Merge pull request #474 from Azure/lily-patch
lilyjma Apr 6, 2021
97caf51
moved samples to approach directories
Apr 7, 2021
1362353
Remove duplicate sample for EventHubsCaptureEventGridDemo
ramya-rao-a Apr 9, 2021
6d8fc54
Merge pull request #477 from ramya-rao-a/remove-dupe
spelluru Apr 12, 2021
10df2c2
Merge pull request #476 from Azure/lily-patch2
spelluru Apr 12, 2021
809eb4c
Clean up of the EventHubsCaptureEventGridDemo sample in the azure-eve…
zedy-wj Apr 15, 2021
71ed5ea
Add pointers to new packages in readme files at the root and for .Net…
ramya-rao-a Apr 16, 2021
d961416
Updating to use EventHubsCaptureAvroBlobUri to create the BlobClient …
zedy-wj Apr 19, 2021
4cadf09
Updating the Reference
zedy-wj Apr 21, 2021
bffa22a
Merge pull request #479 from zedy-wj/CleanupEventhub
spelluru Apr 23, 2021
4e99f54
Bump log4net in /samples/e2e/EventHubsCaptureEventGridDemo/DWDumper
dependabot[bot] Apr 23, 2021
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
Original file line number Diff line number Diff line change
@@ -21,6 +21,14 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json;
using Azure.Messaging.EventHubs;
using Azure.Messaging.EventHubs.Producer;

namespace WindTurbineDataGenerator
{
@@ -39,31 +40,30 @@ private static async Task StartEventGenerationAsync(CancellationToken cancellati
{
var random = new Random((int)DateTimeOffset.UtcNow.Ticks);

// create an Event Hubs client using the namespace connection string and the event hub name
EventHubClient client = new EventHubClient(EventHubConnectionString, EventHubName);

// create a producer object to send messages to the event hub
EventHubProducer producer = client.CreateProducer();
// create an Event Hubs Producer client using the namespace connection string and the event hub name
EventHubProducerClient producerClient = new EventHubProducerClient(EventHubConnectionString, EventHubName);

while (!cancellationToken.IsCancellationRequested)
{
try
{
// Simulate sending data from 100 weather sensors
var devicesData = new List<EventData>();

// prepare a batch of events to send to the event hub.
EventDataBatch eventBatch = await producerClient.CreateBatchAsync();
for (int i = 0; i < 100; i++)
{
int scaleFactor = random.Next(0, 25);
var windTurbineMeasure = GenerateTurbineMeasure("Turbine_" + i, scaleFactor);
EventData evData = SerializeWindTurbineToEventData(windTurbineMeasure);
devicesData.Add(evData);
// add the event to the batch
if (eventBatch.TryAdd(evData) == false)
break;
}

Console.Write(".");

// send the message to the event hub
await producer.SendAsync(devicesData);
// send the batch of events to the event hub
await producerClient.SendAsync(eventBatch);
}
catch (Exception ex)
{
@@ -73,7 +73,7 @@ private static async Task StartEventGenerationAsync(CancellationToken cancellati

await Task.Delay(1000, cancellationToken);
}
}
}

private static WindTurbineMeasure GenerateTurbineMeasure(string turbineId, int scaleFactor)
{
Original file line number Diff line number Diff line change
@@ -32,20 +32,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Azure.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.0.0-preview.9\lib\netstandard2.0\Azure.Core.dll</HintPath>
<Reference Include="Azure.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.5.0\lib\net461\Azure.Core.dll</HintPath>
</Reference>
<Reference Include="Azure.Messaging.EventHubs, Version=5.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Messaging.EventHubs.5.0.0-preview.4\lib\netstandard2.0\Azure.Messaging.EventHubs.dll</HintPath>
<Reference Include="Azure.Messaging.EventHubs, Version=5.2.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Messaging.EventHubs.5.2.0\lib\netstandard2.0\Azure.Messaging.EventHubs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Amqp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Amqp.2.4.2\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
<HintPath>..\packages\Microsoft.Azure.Amqp.2.4.5\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.EventHubs, Version=1.0.2.0, Culture=neutral, PublicKeyToken=7e34167dcc6d6d8c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.EventHubs.1.0.2\lib\net451\Microsoft.Azure.EventHubs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0-rc1.19456.4\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -56,7 +56,7 @@
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0-rc1.19456.4\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
@@ -78,8 +78,8 @@
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -107,12 +107,21 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.6.0-rc1.19456.4\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
<HintPath>..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Azure.Core" version="1.0.0-preview.9" targetFramework="net461" />
<package id="Azure.Messaging.EventHubs" version="5.0.0-preview.4" targetFramework="net461" />
<package id="Microsoft.Azure.Amqp" version="2.4.2" targetFramework="net461" />
<package id="Azure.Core" version="1.5.0" targetFramework="net461" />
<package id="Azure.Messaging.EventHubs" version="5.2.0" targetFramework="net461" />
<package id="Microsoft.Azure.Amqp" version="2.4.5" targetFramework="net461" />
<package id="Microsoft.Azure.EventHubs" version="1.0.2" targetFramework="net461" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0-rc1.19456.4" targetFramework="net461" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0-rc1.19456.4" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net461" />
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
<package id="System.Net.WebSockets" version="4.0.0" targetFramework="net461" />
<package id="System.Net.WebSockets.Client" version="4.0.2" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
<package id="System.Threading.Channels" version="4.6.0-rc1.19456.4" targetFramework="net461" />
<package id="System.Text.Encodings.Web" version="4.6.0" targetFramework="net461" />
<package id="System.Text.Json" version="4.6.0" targetFramework="net461" />
<package id="System.Threading.Channels" version="4.6.0" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages>