Skip to content

Commit a57b614

Browse files
fsimonazzifsimonazzi
committed
Merge branch '3_5_rtm_branding' of https://git01.codeplex.com/forks/fsimonazzi/unitydevfork into fsimonazzi/rtmbranding
2 parents af75f13 + 98d0f6c commit a57b614

File tree

9 files changed

+43
-36
lines changed

9 files changed

+43
-36
lines changed

‎source/Common/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#else
1818
[assembly: AssemblyConfiguration("Release")]
1919
#endif
20-
[assembly: AssemblyCopyright("Copyright © 2011,2012 Microsoft Corporation.")]
20+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323

2424
[assembly: AssemblyVersion("3.5.0.0")]
2525
[assembly: AssemblyFileVersion("3.5.1404.0")]
26-
[assembly: AssemblyInformationalVersion("3.5.1404-prerelease")]
26+
[assembly: AssemblyInformationalVersion("3.5.1404.0")]

‎source/NuGet/Unity.Interception.nuspec‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Unity.Interception</id>
55
<version>$Microsoft_Practices_Unity_Interception_Version$</version>
6-
<title>Unity Interception Extension (PRE-RELEASE)</title>
6+
<title>Unity Interception Extension</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft; patterns-and-practices</owners>
9-
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
10-
<projectUrl>http://unity.codeplex.com</projectUrl>
11-
<requireLicenseAcceptance>true</requireLicenseAcceptance>
129
<description>Unity interception enables you to effectively capture calls to objects and add additional functionality to the target object. Interception is useful when you want to modify the behavior for individual objects but not the entire class, very much as you would do when using the Decorator pattern. It provides a flexible approach for adding new behaviors to an object at run time.</description>
1310
<summary>Unity interception enables you to effectively capture calls to objects and add additional functionality to the target object.</summary>
14-
<releaseNotes />
15-
<tags>Unity Unity3 EntLib entlib6 IoC DI container interception AOP aspect LOB Windows8 futures OSS</tags>
11+
<projectUrl>http://unity.codeplex.com</projectUrl>
12+
<iconUrl>http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png</iconUrl>
13+
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
15+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1616
<dependencies>
1717
<dependency id="Unity" version="$Microsoft_Practices_Unity_Version$" />
1818
</dependencies>
19+
<tags>Unity Unity3 Unity35 EntLib entlib6 IoC DI container interception AOP aspect LOB Windows8 OSS</tags>
1920
</metadata>
2021
<files>
2122
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.Interception.dll" target="lib\Net45" />

‎source/NuGet/Unity.nuspec‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Unity</id>
55
<version>$Microsoft_Practices_Unity_Version$</version>
6-
<title>Unity (PRE-RELEASE)</title>
6+
<title>Unity</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft; patterns-and-practices</owners>
9-
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
9+
<description>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection. It facilitates loosely-coupled design. Declarative configuration and registration by convention are supported on selected platforms.</description>
10+
<summary>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection.</summary>
1011
<projectUrl>http://unity.codeplex.com</projectUrl>
12+
<iconUrl>http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png</iconUrl>
13+
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1115
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1216
<dependencies>
1317
<group targetFramework="win8">
@@ -17,14 +21,12 @@
1721
<dependency id="CommonServiceLocator" version="1.2.0" />
1822
</group>
1923
</dependencies>
20-
<description>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection. It facilitates loosely-coupled design.</description>
21-
<summary>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection.</summary>
22-
<tags>Unity EntLib EntLib6 IoC DI container dependency injection inversion control LOB WinRT Win8 Windows8 NetCore WindowsStoreApps WindowsStore futures OSS</tags>
24+
<tags>Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control LOB WinRT Win8 Windows8 NetCore WindowsStoreApps WindowsStore WindowsPhone WindowsPhone8 wp8 Azure Xamarin MonoTouch MonoAndroid OSS</tags>
2325
</metadata>
2426
<files>
25-
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.dll" target="lib\portable-net45+wp80+win8" />
26-
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.pdb" target="lib\portable-net45+wp80+win8" />
27-
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.xml" target="lib\portable-net45+wp80+win8" />
27+
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.dll" target="lib\portable-net45+wp80+win8+MonoAndroid10+MonoTouch10" />
28+
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.pdb" target="lib\portable-net45+wp80+win8+MonoAndroid10+MonoTouch10" />
29+
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.xml" target="lib\portable-net45+wp80+win8+MonoAndroid10+MonoTouch10" />
2830
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.dll" target="lib\net45" />
2931
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.pdb" target="lib\net45" />
3032
<file src="bin\Desktop\$Configuration$\Microsoft.Practices.Unity.xml" target="lib\net45" />

‎source/Unity.Interception/Src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
#else
2727
[assembly: AssemblyConfiguration("Release")]
2828
#endif
29-
[assembly: AssemblyCopyright("Copyright © 2011,2012 Microsoft Corporation.")]
29+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
3030
[assembly: AssemblyTrademark("")]
3131
[assembly: AssemblyCulture("")]
3232

3333
[assembly: AssemblyVersion("3.5.0.0")]
3434
[assembly: AssemblyFileVersion("3.5.1404.0")]
35-
[assembly: AssemblyInformationalVersion("3.5.1404-prerelease")]
35+
[assembly: AssemblyInformationalVersion("3.5.1404.0")]
3636

3737
[assembly: NeutralResourcesLanguage("en")]

‎source/Unity.Mvc/Src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#else
1818
[assembly: AssemblyConfiguration("Release")]
1919
#endif
20-
[assembly: AssemblyCopyright("Copyright © 2011,2012 Microsoft Corporation.")]
20+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323

2424
[assembly: AssemblyVersion("3.5.0.0")]
2525
[assembly: AssemblyFileVersion("3.5.1404.0")]
26-
[assembly: AssemblyInformationalVersion("3.5.1404-prerelease")]
26+
[assembly: AssemblyInformationalVersion("3.5.1404.0")]
2727

2828
[assembly: ComVisible(false)]
2929
[assembly: NeutralResourcesLanguage("en")]

‎source/Unity.Mvc/Src/Unity.Mvc.nuspec‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
<metadata schemaVersion="2">
44
<id>Unity.Mvc</id>
55
<version>$Microsoft_Practices_Unity_WebApi_Version$</version>
6-
<title>Unity bootstrapper for ASP.NET MVC (PRE-RELEASE)</title>
6+
<title>Unity bootstrapper for ASP.NET MVC</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft; patterns-and-practices</owners>
9-
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
9+
<description>Unity is a lightweight extensible dependency injection container. This package is a Unity bootstrapper for ASP.NET MVC.</description>
10+
<summary>This package is a Unity bootstrapper for ASP.NET MVC</summary>
1011
<projectUrl>http://unity.codeplex.com</projectUrl>
12+
<iconUrl>http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png</iconUrl>
13+
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1115
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12-
<description>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection. It facilitates loosely-coupled design.</description>
13-
<summary>The Unity Application Block (Unity) is a lightweight extensible dependency injection container with support for constructor, property, and method call injection.</summary>
14-
<tags>Unity EntLib EntLib6 IoC DI container dependency injection inversion control aspnet mvc aspnetmvc LOB futures OSS</tags>
1516
<dependencies>
1617
<dependency id="Unity" version="$Microsoft_Practices_Unity_Version$" />
1718
<dependency id="WebActivatorEx" version="2.0" />
1819
</dependencies>
1920
<frameworkAssemblies>
2021
<frameworkAssembly assemblyName="System.Web" targetFramework="net40" />
2122
</frameworkAssemblies>
23+
<tags>Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control aspnet mvc aspnetmvc LOB OSS</tags>
2224
</metadata>
2325
<files>
2426
<file src="Unity.Mvc\Src\NuGet\UnityConfig.cs.pp" target="content\App_Start" />

‎source/Unity.WebApi/Src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#else
1818
[assembly: AssemblyConfiguration("Release")]
1919
#endif
20-
[assembly: AssemblyCopyright("Copyright © 2011,2012 Microsoft Corporation.")]
20+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323

2424
[assembly: AssemblyVersion("3.5.0.0")]
2525
[assembly: AssemblyFileVersion("3.5.1404.0")]
26-
[assembly: AssemblyInformationalVersion("3.5.1404-prerelease")]
26+
[assembly: AssemblyInformationalVersion("3.5.1404.0")]
2727

2828
[assembly: ComVisible(false)]
2929
[assembly: NeutralResourcesLanguage("en")]

‎source/Unity.WebApi/Src/Unity.WebApi.nuspec‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
<metadata>
44
<id>Unity.AspNet.WebApi</id>
55
<version>$Microsoft_Practices_Unity_Mvc_Version$</version>
6-
<title>Unity bootstrapper for ASP.NET Web API (PRE-RELEASE)</title>
6+
<title>Unity bootstrapper for ASP.NET Web API</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft; patterns-and-practices</owners>
9-
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
9+
<description>Unity is a lightweight extensible dependency injection container. This package is a Unity bootstrapper for ASP.NET Web API.</description>
10+
<summary>This package is a Unity bootstrapper for ASP.NET Web API</summary>
1011
<projectUrl>http://unity.codeplex.com</projectUrl>
12+
<iconUrl>http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png</iconUrl>
13+
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1115
<requireLicenseAcceptance>true</requireLicenseAcceptance>
12-
<description>Unity bootstrapper for ASP.NET Web API</description>
13-
<summary>This is a Unity bootstrapper for ASP.NET Web API</summary>
14-
<tags>Unity EntLib EntLib6 IoC DI container dependency injection inversion control aspnet webapi web api aspnetwebapi LOB futures OSS</tags>
1516
<dependencies>
1617
<dependency id="Unity" version="$Microsoft_Practices_Unity_Version$" />
1718
<dependency id="WebActivatorEx" version="2.0" />
1819
<dependency id="Microsoft.AspNet.WebApi.WebHost" version="4.0" />
1920
</dependencies>
21+
<tags>Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control aspnet webapi web api aspnetwebapi LOB OSS</tags>
2022
</metadata>
2123
<files>
2224
<file src="Unity.Mvc\Src\NuGet\UnityConfig.cs.pp" target="content\App_Start" />

‎source/Unity/Src/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#else
1616
[assembly: AssemblyConfiguration("Release")]
1717
#endif
18-
[assembly: AssemblyCopyright("Copyright © 2011,2012 Microsoft Corporation.")]
18+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
1919
[assembly: AssemblyTrademark("")]
2020
[assembly: AssemblyCulture("")]
2121

2222
[assembly: AssemblyVersion("3.5.0.0")]
2323
[assembly: AssemblyFileVersion("3.5.1404.0")]
24-
[assembly: AssemblyInformationalVersion("3.5.1404-prerelease")]
24+
[assembly: AssemblyInformationalVersion("3.5.1404.0")]

0 commit comments

Comments
 (0)