fixes windows build

This commit is contained in:
Matthias Dittrich 2012-07-17 14:58:13 +02:00 committed by Hylke Bons
parent 7e2badc3b4
commit 0887aff38d
8 changed files with 16 additions and 28 deletions

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -80,6 +80,7 @@
</Compile> </Compile>
<Compile Include="..\SparkleWatcher.cs"> <Compile Include="..\SparkleWatcher.cs">
<Link>SparkleWatcher.cs</Link> <Link>SparkleWatcher.cs</Link>
<SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="..\SparkleWatcherFactory.cs"> <Compile Include="..\SparkleWatcherFactory.cs">
<Link>SparkleWatcherFactory.cs</Link> <Link>SparkleWatcherFactory.cs</Link>

View file

@ -32,13 +32,6 @@ namespace SparkleShare {
private Label updates; private Label updates;
// Short alias for the translations
public static string _(string s)
{
return Program._(s);
}
public SparkleAbout () public SparkleAbout ()
{ {
Title = "About SparkleShare"; Title = "About SparkleShare";

View file

@ -147,7 +147,7 @@ namespace SparkleShare {
File.Delete (shortcut_path); File.Delete (shortcut_path);
Shortcut shortcut = new Shortcut (); Shortcut shortcut = new Shortcut ();
shortcut.Create (FoldersPath, shortcut_target); shortcut.Create (FoldersPath, shortcut_path);
} }

View file

@ -42,13 +42,6 @@ namespace SparkleShare {
private SparkleSpinner spinner; private SparkleSpinner spinner;
// Short alias for the translations
public static string _(string s)
{
return Program._(s);
}
public SparkleEventLog () public SparkleEventLog ()
{ {
Title = "Recent Changes"; Title = "Recent Changes";

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -10,9 +10,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SparkleShareInviteOpener</RootNamespace> <RootNamespace>SparkleShareInviteOpener</RootNamespace>
<AssemblyName>SparkleShareInviteOpener</AssemblyName> <AssemblyName>SparkleShareInviteOpener</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ApplicationIcon>..\Pixmaps\sparkleshare-app.ico</ApplicationIcon> <ApplicationIcon>..\Pixmaps\sparkleshare-app.ico</ApplicationIcon>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -38,6 +39,9 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="sparkleshare-invite-opener.cs" /> <Compile Include="sparkleshare-invite-opener.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View file

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

View file

@ -53,7 +53,7 @@ namespace SparkleShare {
if (xml.Contains ("<sparkleshare>")) { if (xml.Contains ("<sparkleshare>")) {
File.WriteAllText (target_path, xml); File.WriteAllText (target_path, xml);
Console.WriteLine ("Downloaded invite: " + safe_url); Console.WriteLine ("Downloaded invite: " + url);
} }
} }
} }

View file

@ -46,12 +46,6 @@ namespace SparkleShare {
private SparkleNotifyIcon notify_icon = new SparkleNotifyIcon (); private SparkleNotifyIcon notify_icon = new SparkleNotifyIcon ();
// Short alias for the translations
public static string _ (string s)
{
return Program._ (s);
}
public SparkleStatusIcon () public SparkleStatusIcon ()
{ {