Skip to content

Commit d2d0a12

Browse files
committed
reuse existing assembly info file for rbc
1 parent 164c8ea commit d2d0a12

File tree

5 files changed

+12
-32
lines changed

5 files changed

+12
-32
lines changed

source/Common/GlobalAssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyProduct("Microsoft Unity Application Block")]
99
[assembly: AssemblyCompany("Microsoft Corporation")]
1010

11-
#if !SILVERLIGHT && !NETFX_CORE
11+
#if !WINDOWS_PHONE && !NETFX_CORE
1212
[assembly: AllowPartiallyTrustedCallers]
1313
#endif
1414

source/Unity/Src/RegistrationByConvention/GlobalAssemblyInfo.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.NetCore.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<DefaultLanguage>en-US</DefaultLanguage>
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<BaseIntermediateOutputPath>obj\NetCore</BaseIntermediateOutputPath>
17+
<BaseIntermediateOutputPath>obj\NetCore</BaseIntermediateOutputPath>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DebugSymbols>true</DebugSymbols>
@@ -45,10 +45,12 @@
4545
</ProjectReference>
4646
</ItemGroup>
4747
<ItemGroup>
48+
<Compile Include="..\..\..\Common\GlobalAssemblyInfo.cs">
49+
<Link>GlobalAssemblyInfo.cs</Link>
50+
</Compile>
4851
<Compile Include="AllClasses.cs" />
4952
<Compile Include="AllClasses.NetCore.cs" />
5053
<Compile Include="DuplicateTypeMappingException.cs" />
51-
<Compile Include="GlobalAssemblyInfo.cs" />
5254
<Compile Include="Properties\AssemblyInfo.cs" />
5355
<Compile Include="RegistrationConvention.cs" />
5456
<Compile Include="Resources.NetCore.cs">

source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.WindowsPhone.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ValidateXaml>true</ValidateXaml>
1919
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
2020
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
21-
<BaseIntermediateOutputPath>obj\WindowsPhone</BaseIntermediateOutputPath>
21+
<BaseIntermediateOutputPath>obj\WindowsPhone</BaseIntermediateOutputPath>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2424
<DebugSymbols>true</DebugSymbols>
@@ -48,10 +48,12 @@
4848
<CodeAnalysisRuleSet>..\..\..\Unity.ruleset</CodeAnalysisRuleSet>
4949
</PropertyGroup>
5050
<ItemGroup>
51+
<Compile Include="..\..\..\Common\GlobalAssemblyInfo.cs">
52+
<Link>GlobalAssemblyInfo.cs</Link>
53+
</Compile>
5154
<Compile Include="AllClasses.cs" />
5255
<Compile Include="AllClasses.NetCore.cs" />
5356
<Compile Include="DuplicateTypeMappingException.cs" />
54-
<Compile Include="GlobalAssemblyInfo.cs" />
5557
<Compile Include="Properties\AssemblyInfo.cs" />
5658
<Compile Include="Properties\Resources.Designer.cs">
5759
<AutoGen>True</AutoGen>

source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@
4747
<Reference Include="System.Xml" />
4848
</ItemGroup>
4949
<ItemGroup>
50+
<Compile Include="..\..\..\Common\GlobalAssemblyInfo.cs">
51+
<Link>GlobalAssemblyInfo.cs</Link>
52+
</Compile>
5053
<Compile Include="AllClasses.cs" />
5154
<Compile Include="AllClasses.Desktop.cs" />
5255
<Compile Include="DuplicateTypeMappingException.cs" />
5356
<Compile Include="DuplicateTypeMappingException.Desktop.cs" />
54-
<Compile Include="GlobalAssemblyInfo.cs" />
5557
<Compile Include="Properties\AssemblyInfo.cs" />
5658
<Compile Include="Properties\Resources.Designer.cs">
5759
<AutoGen>True</AutoGen>

0 commit comments

Comments
 (0)