Skip to content

Commit b6493f8

Browse files
mathewcmathewc
committed
Assembly Name + Namespace updates
1 parent 3c6ccf2 commit b6493f8

37 files changed

+100
-86
lines changed

‎src/WebJobs.Script.Host/GlobalSuppressions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
// You do not need to add suppressions to this file manually.
1010

1111
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "WebJobs.Script.Host.Program.#Main(System.String[])")]
12+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Host.Program.#Main(System.String[])")]

‎src/WebJobs.Script.Host/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using Microsoft.Azure.WebJobs.Script;
66

7-
namespace WebJobs.Script.Host
7+
namespace Microsoft.Azure.WebJobs.Script.Host
88
{
99
public static class Program
1010
{

‎src/WebJobs.Script.Host/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// General Information about an assembly is controlled through the following
99
// set of attributes. Change these attribute values to modify the information
1010
// associated with an assembly.
11-
[assembly: AssemblyTitle("WebJobs.Script.Host")]
11+
[assembly: AssemblyTitle("Microsoft.Azure.WebJobs.Script.Host")]
1212
[assembly: AssemblyDescription("")]
1313
[assembly: AssemblyConfiguration("")]
1414
[assembly: AssemblyTrademark("")]

‎src/WebJobs.Script.Host/WebJobs.Script.Host.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{F5FAB5A1-A816-441B-86BF-CA3CAE2F7588}</ProjectGuid>
88
<OutputType>Exe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>WebJobs.Script.Host</RootNamespace>
11-
<AssemblyName>WebJobs.Script.Host</AssemblyName>
10+
<RootNamespace>Microsoft.Azure.WebJobs.Script.Host</RootNamespace>
11+
<AssemblyName>Microsoft.Azure.WebJobs.Script.Host</AssemblyName>
1212
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

‎src/WebJobs.Script.WebHost/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// General Information about an assembly is controlled through the following
99
// set of attributes. Change these attribute values to modify the information
1010
// associated with an assembly.
11-
[assembly: AssemblyTitle("WebJobs.Script.WebHost")]
11+
[assembly: AssemblyTitle("Microsoft.Azure.WebJobs.Script.WebHost")]
1212
[assembly: AssemblyDescription("")]
1313
[assembly: AssemblyConfiguration("")]
1414
[assembly: AssemblyTrademark("")]
@@ -29,4 +29,4 @@
2929
[assembly: AssemblyVersion("1.0.0.0")]
3030
[assembly: AssemblyFileVersion("1.0.0.0")]
3131

32-
[assembly: InternalsVisibleTo("WebJobs.Script.Tests")]
32+
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1414
<OutputType>Library</OutputType>
1515
<AppDesignerFolder>Properties</AppDesignerFolder>
16-
<RootNamespace>WebJobs.Script.WebHost</RootNamespace>
17-
<AssemblyName>WebJobs.Script.WebHost</AssemblyName>
16+
<RootNamespace>Microsoft.Azure.WebJobs.Script.WebHost</RootNamespace>
17+
<AssemblyName>Microsoft.Azure.WebJobs.Script.WebHost</AssemblyName>
1818
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1919
<UseIISExpress>true</UseIISExpress>
2020
<IISExpressSSLPort />

‎src/WebJobs.Script/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
[assembly: AssemblyVersion("1.0.0.0")]
3131
[assembly: AssemblyFileVersion("1.0.0.0")]
3232

33-
[assembly: InternalsVisibleTo("WebJobs.Script.Tests")]
33+
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]

‎src/WebJobs.Script/WebJobs.Script.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
<HintPath>..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
235235
<Private>True</Private>
236236
</Reference>
237+
<Reference Include="System.Web.Extensions" />
237238
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
238239
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
239240
<Private>True</Private>

‎src/WebJobs.Script/app.config‎

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,61 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
8-
</dependentAssembly>
9-
<dependentAssembly>
10-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
12-
</dependentAssembly>
13-
<dependentAssembly>
14-
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.0.20511.1437" newVersion="4.0.20511.1437" />
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
20-
</dependentAssembly>
21-
<dependentAssembly>
22-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
24-
</dependentAssembly>
25-
<dependentAssembly>
26-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
28-
</dependentAssembly>
29-
<dependentAssembly>
30-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
32-
</dependentAssembly>
33-
<dependentAssembly>
34-
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35-
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
36-
</dependentAssembly>
37-
<dependentAssembly>
38-
<assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
39-
<bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
40-
</dependentAssembly>
41-
</assemblyBinding>
42-
</runtime>
43-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
44-
<appSettings>
45-
</appSettings>
46-
</configuration>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.0.20511.1437" newVersion="4.0.20511.1437" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
40+
</dependentAssembly>
41+
</assemblyBinding>
42+
</runtime>
43+
<startup>
44+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
45+
</startup>
46+
<appSettings>
47+
<add key="ClientSettingsProvider.ServiceUri" value="" />
48+
</appSettings>
49+
<system.web>
50+
<membership defaultProvider="ClientAuthenticationMembershipProvider">
51+
<providers>
52+
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
53+
</providers>
54+
</membership>
55+
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
56+
<providers>
57+
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
58+
</providers>
59+
</roleManager>
60+
</system.web>
61+
</configuration>

‎test/WebJobs.Script.Tests/AdminControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using WebJobs.Script.WebHost.Filters;
99
using Xunit;
1010

11-
namespace WebJobs.Script.Tests
11+
namespace Microsoft.Azure.WebJobs.Script.Tests
1212
{
1313
public class AdminControllerTests
1414
{

0 commit comments

Comments
 (0)