Skip to content

Commit

Permalink
Merge branch 'master' into filemovementupdates
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmboggs
rmboggs committed Mar 5, 2012
2 parents 7420539 + 8b95eb5 commit 468cdd8
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 4 deletions.
128 changes: 124 additions & 4 deletions src/NAnt.Console/App.config
View file
Expand Up @@ -1300,14 +1300,14 @@
<task-assemblies>
<!-- include MS.NET version-neutral assemblies -->
<include name="extensions/net/neutral/**/*.dll" />
<!-- include MS.NET 2.0 specific assemblies -->
<include name="extensions/net/2.0/**/*.dll" />
<!-- include MS.NET 4.0 specific assemblies -->
<include name="extensions/net/4.0/**/*.dll" />
<!-- include MS.NET specific task assembly -->
<include name="NAnt.MSNetTasks.dll" />
<!-- include MS.NET specific test assembly -->
<include name="NAnt.MSNet.Tests.dll" />
<!-- include .NET 2.0 specific assemblies -->
<include name="extensions/common/2.0/**/*.dll" />
<!-- include .NET 4.0 specific assemblies -->
<include name="extensions/common/4.0/**/*.dll" />
</task-assemblies>
<tool-paths>
<directory name="${SL4RefAssemblyBaseDir}" />
Expand Down Expand Up @@ -1370,6 +1370,126 @@
</task>
</tasks>
</framework>
<framework
name="silverlight-5.0"
family="silverlight"
version="5.0"
description="Microsoft Silverlight 5.0"
sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
frameworkassemblydirectory="${SL5RefAssemblyBaseDir}"
clrversion="4.0.30319"
clrtype="Browser"
vendor="Microsoft"
>
<runtime>
<modes>
<strict>
<environment>
<variable name="COMPLUS_VERSION" value="v4.0.30319" />
</environment>
</strict>
</modes>
</runtime>
<reference-assemblies basedir="${SL5RefAssemblyBaseDir}">
<include name="Microsoft.VisualBasic.dll" />
<include name="mscorlib.dll" />
<include name="System.Core.dll" />
<include name="system.dll" />
<include name="System.Xml.dll" />
<include name="System.Windows.dll" />
<include name="System.Windows.Browser.dll" />
<!-- Remaining libraries found in the Reference Assembly directory -->
<include name="agcore.debug.dll" />
<include name="agcore.dll" />
<include name="coreclr.dll" />
<include name="mscorrc.debug.dll" />
<include name="mscorrc.dll" />
<include name="npctrl.dll" />
<include name="npctrlui.dll" />
<include name="System.Net.dll" />
<include name="System.Runtime.Serialization.dll" />
<include name="System.ServiceModel.dll" />
<include name="System.ServiceModel.Web.dll" />
<!-- Remaining libraries are specific to XNA programming -->
<include name="Microsoft.Xna.Framework.dll" />
<include name="Microsoft.Xna.Framework.Graphics.dll" />
<include name="Microsoft.Xna.Framework.Graphics.Shaders.dll" />
<include name="System.Windows.Xna.dll" />
</reference-assemblies>
<task-assemblies>
<!-- include MS.NET version-neutral assemblies -->
<include name="extensions/net/neutral/**/*.dll" />
<!-- include MS.NET 4.0 specific assemblies -->
<include name="extensions/net/4.0/**/*.dll" />
<!-- include MS.NET specific task assembly -->
<include name="NAnt.MSNetTasks.dll" />
<!-- include MS.NET specific test assembly -->
<include name="NAnt.MSNet.Tests.dll" />
<!-- include .NET 4.0 specific assemblies -->
<include name="extensions/common/4.0/**/*.dll" />
</task-assemblies>
<tool-paths>
<directory name="${SL5RefAssemblyBaseDir}" />
<directory name="${path::combine(sdkInstallRoot, 'bin')}"
if="${property::exists('sdkInstallRoot')}" />
<directory name="${path::combine(installRoot, 'v4.0.30319')}" />
</tool-paths>
<project>
<readregistry property="SL5RefAssemblyBaseDir"
key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v5.0\ReferenceAssemblies\SLRuntimeInstallPath"
hive="LocalMachine" />
<readregistry
property="installRoot"
key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
hive="LocalMachine" />
<locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
</project>
<tasks>
<task name="csc">
<attribute name="noconfig">true</attribute>
<attribute name="nostdlib">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
<attribute name="supportswarnaserrorlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
<attribute name="supportsdelaysign">true</attribute>
<attribute name="supportsplatform">true</attribute>
<attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<attribute name="nostdlib">true</attribute>
<attribute name="supportsdocgeneration">true</attribute>
<attribute name="supportsnostdlib">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
<attribute name="supportsdelaysign">true</attribute>
<attribute name="supportsplatform">true</attribute>
<attribute name="supportswarnaserrorlist">true</attribute>
</task>
<task name="jsc">
<attribute name="supportsplatform">true</attribute>
</task>
<task name="vjc">
<attribute name="supportsnowarnlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
<attribute name="supportsdelaysign">true</attribute>
</task>
<task name="resgen">
<attribute name="supportsassemblyreferences">true</attribute>
<attribute name="supportsexternalfilereferences">true</attribute>
</task>
<task name="delay-sign">
<attribute name="exename">sn</attribute>
</task>
<task name="license">
<attribute name="exename">lc</attribute>
<attribute name="supportsassemblyreferences">true</attribute>
</task>
</tasks>
</framework>
<framework
name="mono-1.0"
family="mono"
Expand Down
5 changes: 5 additions & 0 deletions web/index.html
View file
Expand Up @@ -1417,6 +1417,11 @@ <h4>NAnt 0.91 Release <span style="font-size: 9px; color: red;">October 22, 2011
<td style="text-align: center;"><img alt="*" src="checkmark.gif" /></td>
<td style="text-align: center;"></td>
</tr>
<tr style="background-color: #dfff80;">
<td>Silverlight 5.0</td>
<td style="text-align: center;"><img alt="*" src="checkmark.gif" /></td>
<td style="text-align: center;"></td>
</tr>
</table>
</p>
<h2>Tips</h2>
Expand Down

0 comments on commit 468cdd8

Please sign in to comment.