Skip to content

Commit 2c3d8ee

Browse files
StephenMolloyStephenMolloy
authored
Merge pull request #16 from aspnet/1.0.0-rtm
1.0.0 rtm
2 parents 7615d51 + 4887033 commit 2c3d8ee

30 files changed

+242
-70
lines changed

‎MicrosoftConfigurationBuilders.msbuild‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="tools\MicrosoftConfigurationBuilders.settings.targets"/>
3-
42
<ItemGroup>
53
<AssemblyProject Include="src\Base\Base.csproj" />
64
<AssemblyProject Include="src\Environment\Environment.csproj" />

‎MicrosoftConfigurationBuilders.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "test\Microsoft.Conf
3333
EndProject
3434
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{91E7BC05-1980-48F2-B3F4-CE56EB3D114F}"
3535
ProjectSection(SolutionItems) = preProject
36+
tools\MicrosoftConfigurationBuilders.settings.targets = tools\MicrosoftConfigurationBuilders.settings.targets
3637
README.md = README.md
3738
EndProjectSection
3839
EndProject

‎clean.cmd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,8 @@ if not defined MSBUILDEXE (
3838
:BUILD
3939
REM %MSBUILDEXE% "%~dp0\MicrosoftConfigurationBuilders.msbuild" /t:Clean %logOptions% /v:d /maxcpucount /nodeReuse:false %*
4040
%MSBUILDEXE% "%~dp0\MicrosoftConfigurationBuilders.msbuild" /t:Clean %logOptions% /v:diag /maxcpucount /nodeReuse:false %*
41+
del /F msbuild.log
42+
del /F msbuild.wrn
43+
del /F msbuild.err
4144

4245
endlocal

‎samples/SampleWebApp/SampleWebApp.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
3-
<Import Project="..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" />
2+
<Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
3+
<Import Project="..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,8 +44,8 @@
4444
<WarningLevel>4</WarningLevel>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
47+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Microsoft.CSharp" />
5151
<Reference Include="System.Web.DynamicData" />
@@ -134,8 +134,8 @@
134134
<PropertyGroup>
135135
<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>
136136
</PropertyGroup>
137-
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
138-
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
137+
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props'))" />
138+
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
139139
</Target>
140140
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
141141
Other similar extension points exist, see Microsoft.Common.targets.

‎samples/SampleWebApp/Web.config‎

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,74 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
https://go.microsoft.com/fwlink/?LinkId=169433
55
-->
66
<configuration>
77
<configSections>
8-
<section name="configBuilders" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
8+
<section name="configBuilders" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false" />
99
</configSections>
1010

1111
<configBuilders>
1212
<builders>
13-
<add name="Environment" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral"/>
13+
<add name="Environment" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral" />
1414
<!-- <add name="Environment" mode="Expand" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral"/> -->
15-
<add name="Secrets" userSecretsFile="~/App_Data/secrets.xml" mode="Greedy" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=1.0.0.0, Culture=neutral"/>
16-
<add name="SimpleJson" jsonFile="~/App_Data/settings.json" ignoreMissingFile="true" type="Microsoft.Configuration.ConfigurationBuilders.SimpleJsonConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Json, Version=1.0.0.0, Culture=neutral"/>
15+
<add name="Secrets" userSecretsFile="~/App_Data/secrets.xml" mode="Greedy" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=1.0.0.0, Culture=neutral" />
16+
<add name="SimpleJson" jsonFile="~/App_Data/settings.json" ignoreMissingFile="true" type="Microsoft.Configuration.ConfigurationBuilders.SimpleJsonConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Json, Version=1.0.0.0, Culture=neutral" />
1717
</builders>
1818
</configBuilders>
1919

2020
<appSettings configBuilders="Environment,SimpleJson,Secrets">
21-
<add key="WINDIR" value="Will be replaced by 'Environment' in Strict and Greedy modes."/>
22-
<add key="SYSTEMDRIVE" value="Will initally be replaced by 'Environment' in Strict and Greedy modes... but then superceded by 'Secrets' in the same modes."/>
23-
<add key="Value_Replaced_By_Environment_In_Expand_Mode" value="${WINDIR}"/>
24-
<add key="ARCHITECTURE" value="Will be replaced by 'Environment' in Strict/Greedy modes IFF prefix='PROCESSOR_' AND stripPrefix='true'"/>
25-
<add key="PROCESSOR_ARCHITECTURE" value="Will be left untouched by 'Environment' in Strict/Greedy modes if IFF prefix='PROCESSOR_' AND stripPrefix='true'"/>
26-
<add key="jsonSetting1" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes."/>
27-
<add key="Value_Replaced_By_SimpleJson_In_Expand_Mode" value="${jsonSetting1}"/>
28-
<add key="appSettings:jsonSubSetting2" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes."/>
29-
<add key="jsonSubSetting2" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
30-
<add key="jsonSub:subSetting3" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
31-
<add key="jsonConnectionString1" value="WILL be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
32-
<add key="jsonConnectionString2" value="WILL NOT be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
33-
<add key="jsonCustomSetting1" value="Will be replaced by 'SimpleJson' with prefix='customSettings:' and stripPrefix='true'."/>
21+
<add key="WINDIR" value="Will be replaced by 'Environment' in Strict and Greedy modes." />
22+
<add key="SYSTEMDRIVE" value="Will initally be replaced by 'Environment' in Strict and Greedy modes... but then superceded by 'Secrets' in the same modes." />
23+
<add key="Value_Replaced_By_Environment_In_Expand_Mode" value="${WINDIR}" />
24+
<add key="ARCHITECTURE" value="Will be replaced by 'Environment' in Strict/Greedy modes IFF prefix='PROCESSOR_' AND stripPrefix='true'" />
25+
<add key="PROCESSOR_ARCHITECTURE" value="Will be left untouched by 'Environment' in Strict/Greedy modes if IFF prefix='PROCESSOR_' AND stripPrefix='true'" />
26+
<add key="jsonSetting1" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes." />
27+
<add key="Value_Replaced_By_SimpleJson_In_Expand_Mode" value="${jsonSetting1}" />
28+
<add key="appSettings:jsonSubSetting2" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes." />
29+
<add key="jsonSubSetting2" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
30+
<add key="jsonSub:subSetting3" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
31+
<add key="jsonConnectionString1" value="WILL be replaced by 'SimpleJson' in 'Flat' jsonMode." />
32+
<add key="jsonConnectionString2" value="WILL NOT be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
33+
<add key="jsonCustomSetting1" value="Will be replaced by 'SimpleJson' with prefix='customSettings:' and stripPrefix='true'." />
3434
</appSettings>
3535

3636
<connectionStrings configBuilders="SimpleJson">
37-
<add name="jsonConnectionString1" connectionString="Will be replaced by 'SimpleJson' in 'Flat' AND 'Sectional' jsonModes, but with different values."/>
38-
<add name="connectionStrings:jsonConnectionString1" connectionString="Will only be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
39-
<add name="jsonConnectionString2" connectionString="Will only be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
40-
<add name="customSettings:jsonConnectionString2" connectionString="Will be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
37+
<add name="jsonConnectionString1" connectionString="Will be replaced by 'SimpleJson' in 'Flat' AND 'Sectional' jsonModes, but with different values." />
38+
<add name="connectionStrings:jsonConnectionString1" connectionString="Will only be replaced by 'SimpleJson' in 'Flat' jsonMode." />
39+
<add name="jsonConnectionString2" connectionString="Will only be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
40+
<add name="customSettings:jsonConnectionString2" connectionString="Will be replaced by 'SimpleJson' in 'Flat' jsonMode." />
4141
</connectionStrings>
4242

4343
<system.web>
44-
<compilation debug="true" targetFramework="4.7.1"/>
45-
<httpRuntime targetFramework="4.7.1"/>
44+
<compilation debug="true" targetFramework="4.7.1" />
45+
<httpRuntime targetFramework="4.7.1" />
4646
</system.web>
4747

48-
<system.codedom>
49-
<compilers>
50-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
51-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
52-
</compilers>
53-
</system.codedom>
54-
5548
<runtime>
5649
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5750
<dependentAssembly>
58-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
59-
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
51+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
6065
</dependentAssembly>
6166
</assemblyBinding>
6267
</runtime>
68+
<system.codedom>
69+
<compilers>
70+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
71+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
72+
</compilers>
73+
</system.codedom>
6374
</configuration>

‎samples/SampleWebApp/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.7" targetFramework="net471" />
4-
<package id="Microsoft.Net.Compilers" version="2.1.0" targetFramework="net471" developmentDependency="true" />
3+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net471" />
4+
<package id="Microsoft.Net.Compilers" version="2.8.0" targetFramework="net471" developmentDependency="true" />
55
</packages>

‎src/Azure/Azure.csproj‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4343
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.7\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Microsoft.Azure.Services.AppAuthentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.0\lib\net452\Microsoft.Azure.Services.AppAuthentication.dll</HintPath>
45+
<Reference Include="Microsoft.Azure.Services.AppAuthentication, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\lib\net452\Microsoft.Azure.Services.AppAuthentication.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.2.6005, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.2\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -75,6 +75,7 @@
7575
</ProjectReference>
7676
</ItemGroup>
7777
<ItemGroup>
78+
<None Include="app.config" />
7879
<None Include="packages.config" />
7980
</ItemGroup>
8081
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -83,5 +84,15 @@
8384
<PropertyGroup>
8485
<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>
8586
</PropertyGroup>
87+
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets'))" />
88+
</Target>
89+
<Import Project="..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets" Condition="Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" />
90+
<Target Name="AfterBuild">
91+
<ItemGroup>
92+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
93+
<Authenticode>Microsoft</Authenticode>
94+
<StrongName>MsSharedLib72</StrongName>
95+
</FilesToSign>
96+
</ItemGroup>
8697
</Target>
8798
</Project>

‎src/Azure/app.config‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
16+
</dependentAssembly>
17+
</assemblyBinding>
18+
</runtime>
19+
</configuration>

‎src/Azure/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Microsoft.Azure.KeyVault" version="2.3.2" targetFramework="net471" />
44
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.7" targetFramework="net471" />
5-
<package id="Microsoft.Azure.Services.AppAuthentication" version="1.0" targetFramework="net471" />
5+
<package id="Microsoft.Azure.Services.AppAuthentication" version="1.0.1" targetFramework="net471" />
66
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.19.2" targetFramework="net471" />
77
<package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net471" />
88
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net471" />

0 commit comments

Comments
 (0)