Skip to content

Commit 8045021

Browse files
StephenMolloyStephenMolloy
authored
Updating nuget dependencies. (#107)
1 parent 7273d77 commit 8045021

7 files changed

Lines changed: 31 additions & 15 deletions

File tree

‎samples/SampleWebApp/SampleWebApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<Version>2.0.1</Version>
5252
</PackageReference>
5353
<PackageReference Include="Azure.Data.AppConfiguration">
54-
<Version>1.0.0-preview.6</Version>
54+
<Version>1.0.0</Version>
5555
</PackageReference>
5656
<PackageReference Include="Azure.Identity">
57-
<Version>1.0.0</Version>
57+
<Version>1.1.1</Version>
5858
</PackageReference>
5959
<PackageReference Include="Azure.Security.KeyVault.Secrets">
6060
<Version>4.0.0</Version>

‎samples/SampleWebApp/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</dependentAssembly>
186186
<dependentAssembly>
187187
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral"/>
188-
<bindingRedirect oldVersion="0.0.0.0-1.0.1.0" newVersion="1.0.1.0"/>
188+
<bindingRedirect oldVersion="0.0.0.0-1.0.2.0" newVersion="1.0.2.0"/>
189189
</dependentAssembly>
190190
<dependentAssembly>
191191
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

‎src/Azure/Azure.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="Azure.Identity">
56-
<Version>1.0.0</Version>
56+
<Version>1.1.1</Version>
5757
</PackageReference>
5858
<PackageReference Include="Azure.Security.KeyVault.Secrets">
5959
<Version>4.0.0</Version>

‎src/AzureAppConfig/AzureAppConfig.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="Azure.Data.AppConfiguration">
56-
<Version>1.0.0-preview.6</Version>
56+
<Version>1.0.0</Version>
5757
</PackageReference>
5858
<PackageReference Include="Azure.Identity">
59-
<Version>1.0.0</Version>
59+
<Version>1.1.1</Version>
6060
</PackageReference>
6161
<PackageReference Include="Azure.Security.KeyVault.Secrets">
6262
<Version>4.0.0</Version>

‎src/AzureAppConfig/AzureAppConfigurationBuilder.cs‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,19 @@ private async Task<string> GetValueAsync(string key)
204204
if (_client == null)
205205
return null;
206206

207-
SettingSelector selector = new SettingSelector(key, _labelFilter);
208-
// TODO: Reduce bandwidth by limiting the fields we retrieve.
209-
//selector.Fields = SettingFields.Key | SettingFields.Value | SettingFields.ContentType;
207+
SettingSelector selector = new SettingSelector();
208+
selector.KeyFilter = key;
209+
if (_labelFilter != null)
210+
{
211+
selector.LabelFilter = _labelFilter;
212+
}
210213
if (_dateTimeFilter > DateTimeOffset.MinValue)
211214
{
212215
selector.AcceptDateTime = _dateTimeFilter;
213216
}
217+
// TODO: Reduce bandwidth by limiting the fields we retrieve.
218+
// Currently, content type doesn't get delivered, even if we add it to the selection. This prevents KeyVault recognition.
219+
//selector.Fields = SettingFields.Key | SettingFields.Value | SettingFields.ContentType;
214220

215221
try
216222
{
@@ -260,13 +266,22 @@ private async Task<ICollection<KeyValuePair<string, string>>> GetAllValuesAsync(
260266
if (_client == null)
261267
return data;
262268

263-
SettingSelector selector = new SettingSelector(_keyFilter, _labelFilter);
264-
// TODO: Reduce bandwidth by limiting the fields we retrieve.
265-
//selector.Fields = SettingFields.Key | SettingFields.Value | SettingFields.ContentType;
269+
SettingSelector selector = new SettingSelector();
270+
if (_keyFilter != null)
271+
{
272+
selector.KeyFilter = _keyFilter;
273+
}
274+
if (_labelFilter != null)
275+
{
276+
selector.LabelFilter = _labelFilter;
277+
}
266278
if (_dateTimeFilter > DateTimeOffset.MinValue)
267279
{
268280
selector.AcceptDateTime = _dateTimeFilter;
269281
}
282+
// TODO: Reduce bandwidth by limiting the fields we retrieve.
283+
// Currently, content type doesn't get delivered, even if we add it to the selection. This prevents KeyVault recognition.
284+
//selector.Fields = SettingFields.Key | SettingFields.Value | SettingFields.ContentType;
270285

271286
// We don't make any guarantees about which kv get precendence when there are multiple of the same key...
272287
// But the config service does seem to return kvs in a preferred order - no label first, then alphabetical by label.

‎src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependencies>
2121
<dependency id="Microsoft.Configuration.ConfigurationBuilders.Base" version="$NuGetPackageBaseDependencyVersion$" />
2222
<dependency id="Azure.Security.KeyVault.Secrets" version="4.0.0" />
23-
<dependency id="Azure.Identity" version="1.0.0" />
23+
<dependency id="Azure.Identity" version="1.1.1" />
2424
</dependencies>
2525
</metadata>
2626
</package>

‎src/packages/ConfigurationBuilders.AzureAppConfiguration.nupkg/Microsoft.Configuration.ConfigurationBuilders.AzureAppConfiguration.nuspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
<dependencies>
2121
<dependency id="Microsoft.Configuration.ConfigurationBuilders.Base" version="$NuGetPackageBaseDependencyVersion$" />
22-
<dependency id="Azure.Data.AppConfiguration" version="1.0.0-preview.6" />
23-
<dependency id="Azure.Identity" version="1.0.0" />
22+
<dependency id="Azure.Data.AppConfiguration" version="1.0.0" />
23+
<dependency id="Azure.Identity" version="1.1.1" />
24+
<dependency id="Azure.Security.KeyVault.Secrets" version="4.0.0" />
2425
</dependencies>
2526
</metadata>
2627
</package>

0 commit comments

Comments
 (0)