Changeset 12035


Ignore:
Timestamp:
Sep 2, 2011, 1:37:06 PM (9 years ago)
Author:
bayral
Message:

changing dot.net framework prerequisite from framework 4.0 to framework 4.0 client profile according to setup process download

Location:
extensions/PiwigoLib
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • extensions/PiwigoLib/Piwigo.sln

    r11904 r12035  
    11
    22Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual C# Express 2010
     3# Visual Studio 2010
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PiwigoLib", "PiwigoLib\PiwigoLib.csproj", "{64C068C5-DBFE-4712-9081-B9100698F35C}"
    55EndProject
     
    77EndProject
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PiwigoWpf", "PiwigoWpf\PiwigoWpf.csproj", "{59F7FCF2-858A-406D-92A6-50514BD89B43}"
     9EndProject
     10Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PiwigoWPFSetup", "PiwigoWPFSetup\PiwigoWPFSetup.vdproj", "{A76EEC3F-427C-432A-8060-40096DF8AA4A}"
    911EndProject
    1012Global
     
    4850                {59F7FCF2-858A-406D-92A6-50514BD89B43}.Release|x86.ActiveCfg = Release|x86
    4951                {59F7FCF2-858A-406D-92A6-50514BD89B43}.Release|x86.Build.0 = Release|x86
     52                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Debug|Any CPU.ActiveCfg = Debug
     53                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Debug|Mixed Platforms.ActiveCfg = Debug
     54                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Debug|x86.ActiveCfg = Debug
     55                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Release|Any CPU.ActiveCfg = Release
     56                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Release|Mixed Platforms.ActiveCfg = Release
     57                {A76EEC3F-427C-432A-8060-40096DF8AA4A}.Release|x86.ActiveCfg = Release
    5058        EndGlobalSection
    5159        GlobalSection(SolutionProperties) = preSolution
  • extensions/PiwigoLib/PiwigoLib/PiwigoLib.csproj

    r11901 r12035  
    1717    <OldToolsVersion>3.5</OldToolsVersion>
    1818    <UpgradeBackupLocation />
     19    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
    1920  </PropertyGroup>
    2021  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    4041      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    4142    </Reference>
    42     <Reference Include="System.Web" />
    4343    <Reference Include="System.Xml.Linq">
    4444      <RequiredTargetFramework>3.5</RequiredTargetFramework>
  • extensions/PiwigoLib/PiwigoLib/Proxy/Helper/PwgProxyReponseHelper.cs

    r11872 r12035  
    8080                foreach (T occurance in values)
    8181                {
    82                     queryStringBuilder.AppendFormat(FormatString, paramName, HttpUtility.UrlEncode(GetString(occurance)));
     82                    queryStringBuilder.AppendFormat(FormatString, paramName, Uri.EscapeUriString(GetString(occurance)));
    8383                    firstOcc = false;
    8484                }
     
    106106                }
    107107
    108                 ParamValue = HttpUtility.UrlEncode(GetString(value));
     108                ParamValue = Uri.EscapeUriString(GetString(value));
    109109               
    110110                queryStringBuilder.AppendFormat(FormatString, paramName, ParamValue);
  • extensions/PiwigoLib/PiwigoLib/Proxy/PwgSessionProxy.cs

    r11850 r12035  
    3535                StringBuilder data = new StringBuilder();
    3636                data.Append("method=pwg.session.login");
    37                 data.Append("&username=" + HttpUtility.UrlEncode(UserName));
    38                 data.Append("&password=" + HttpUtility.UrlEncode(Password));
     37                data.Append("&username=" + Uri.EscapeUriString(UserName));
     38                data.Append("&password=" + Uri.EscapeUriString(Password));
    3939
    4040
  • extensions/PiwigoLib/PiwigoLib/Proxy/PwgTagsProxy.cs

    r11850 r12035  
    121121                StringBuilder data = new StringBuilder();
    122122                data.Append("method=pwg.tags.add");
    123                 data.Append("&name=" + HttpUtility.UrlEncode(tagName));
     123                data.Append("&name=" + Uri.EscapeUriString(tagName));
    124124
    125125                response = PwgGenericProxy<PwgAddRequestProxyResponse>.Post(
  • extensions/PiwigoLib/PiwigoWPFSetup/PiwigoWPFSetup.vdproj

    r12016 r12035  
    1616        "Entry"
    1717        {
     18        "MsmKey" = "8:_73D751648A034FC78611F46D7C42D630"
     19        "OwnerKey" = "8:_UNDEFINED"
     20        "MsmSig" = "8:_UNDEFINED"
     21        }
     22        "Entry"
     23        {
    1824        "MsmKey" = "8:_B577145C952C4BCDBFB90C23E69307C3"
    1925        "OwnerKey" = "8:_UNDEFINED"
     
    2935        {
    3036        "MsmKey" = "8:_UNDEFINED"
     37        "OwnerKey" = "8:_B577145C952C4BCDBFB90C23E69307C3"
     38        "MsmSig" = "8:_UNDEFINED"
     39        }
     40        "Entry"
     41        {
     42        "MsmKey" = "8:_UNDEFINED"
    3143        "OwnerKey" = "8:_B95E7A2ED509F8B7340E8BB7DAFAAE6A"
    32         "MsmSig" = "8:_UNDEFINED"
    33         }
    34         "Entry"
    35         {
    36         "MsmKey" = "8:_UNDEFINED"
    37         "OwnerKey" = "8:_B577145C952C4BCDBFB90C23E69307C3"
    3844        "MsmSig" = "8:_UNDEFINED"
    3945        }
     
    5662        "TimeStampServer" = "8:"
    5763        "InstallerBootstrapper" = "3:2"
     64            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
     65            {
     66            "Enabled" = "11:TRUE"
     67            "PromptEnabled" = "11:TRUE"
     68            "PrerequisitesLocation" = "2:1"
     69            "Url" = "8:"
     70            "ComponentsUrl" = "8:"
     71                "Items"
     72                {
     73                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
     74                    {
     75                    "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)"
     76                    "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client"
     77                    }
     78                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
     79                    {
     80                    "Name" = "8:Windows Installer 3.1"
     81                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
     82                    }
     83                }
     84            }
    5885        }
    5986        "Release"
     
    7299        "TimeStampServer" = "8:"
    73100        "InstallerBootstrapper" = "3:2"
     101            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
     102            {
     103            "Enabled" = "11:TRUE"
     104            "PromptEnabled" = "11:TRUE"
     105            "PrerequisitesLocation" = "2:1"
     106            "Url" = "8:"
     107            "ComponentsUrl" = "8:"
     108            }
    74109        }
    75110    }
     
    78113        "CustomAction"
    79114        {
     115            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_37E419C212744B85A6B147C2F94D3164"
     116            {
     117            "Name" = "8:Primary output from PiwigoWpf (Active)"
     118            "Condition" = "8:"
     119            "Object" = "8:_B577145C952C4BCDBFB90C23E69307C3"
     120            "FileType" = "3:2"
     121            "InstallAction" = "3:4"
     122            "Arguments" = "8:"
     123            "EntryPoint" = "8:"
     124            "Sequence" = "3:1"
     125            "Identifier" = "8:_BCFAC800_40CC_4952_A297_2749A525C9B3"
     126            "InstallerClass" = "11:TRUE"
     127            "CustomActionData" = "8:"
     128            }
     129            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3DF6CBD98735469D96AD3FDFB7FF8272"
     130            {
     131            "Name" = "8:Primary output from PiwigoWpf (Active)"
     132            "Condition" = "8:"
     133            "Object" = "8:_B577145C952C4BCDBFB90C23E69307C3"
     134            "FileType" = "3:2"
     135            "InstallAction" = "3:3"
     136            "Arguments" = "8:"
     137            "EntryPoint" = "8:"
     138            "Sequence" = "3:1"
     139            "Identifier" = "8:_EBC5EA21_EC04_4025_933E_627A179D6B33"
     140            "InstallerClass" = "11:TRUE"
     141            "CustomActionData" = "8:"
     142            }
     143            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_4DEB11B2B84849009D1D5AF5D1CF347D"
     144            {
     145            "Name" = "8:Primary output from PiwigoWpf (Active)"
     146            "Condition" = "8:"
     147            "Object" = "8:_B577145C952C4BCDBFB90C23E69307C3"
     148            "FileType" = "3:2"
     149            "InstallAction" = "3:2"
     150            "Arguments" = "8:"
     151            "EntryPoint" = "8:"
     152            "Sequence" = "3:1"
     153            "Identifier" = "8:_8A0F8EAE_822C_437A_B9DD_F97AC20C611A"
     154            "InstallerClass" = "11:TRUE"
     155            "CustomActionData" = "8:"
     156            }
     157            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_C30EB7E2365747B8B598B3C4CE6AD577"
     158            {
     159            "Name" = "8:Primary output from PiwigoWpf (Active)"
     160            "Condition" = "8:"
     161            "Object" = "8:_B577145C952C4BCDBFB90C23E69307C3"
     162            "FileType" = "3:2"
     163            "InstallAction" = "3:1"
     164            "Arguments" = "8:"
     165            "EntryPoint" = "8:"
     166            "Sequence" = "3:1"
     167            "Identifier" = "8:_2F91C91E_306D_44D6_8E29_6E59A24325B7"
     168            "InstallerClass" = "11:TRUE"
     169            "CustomActionData" = "8:"
     170            }
    80171        }
    81172        "DefaultFeature"
     
    93184                "Name" = "8:.NET Framework 4"
    94185                "Message" = "8:[VSDNETMSG]"
    95                 "FrameworkVersion" = "8:.NETFramework,Version=v4.0"
     186                "FrameworkVersion" = "8:.NETFramework,Version=v4.0,Profile=Client"
    96187                "AllowLaterVersions" = "11:FALSE"
    97188                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=131000"
     
    101192        "File"
    102193        {
     194            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_73D751648A034FC78611F46D7C42D630"
     195            {
     196            "SourcePath" = "8:..\\PiwigoWpf\\Pictures\\PiwigoLogo.png"
     197            "TargetName" = "8:PiwigoLogo.png"
     198            "Tag" = "8:"
     199            "Folder" = "8:_14403438244A4421892648808631B111"
     200            "Condition" = "8:"
     201            "Transitive" = "11:FALSE"
     202            "Vital" = "11:TRUE"
     203            "ReadOnly" = "11:FALSE"
     204            "Hidden" = "11:FALSE"
     205            "System" = "11:FALSE"
     206            "Permanent" = "11:FALSE"
     207            "SharedLegacy" = "11:FALSE"
     208            "PackageAs" = "3:1"
     209            "Register" = "3:1"
     210            "Exclude" = "11:TRUE"
     211            "IsDependency" = "11:FALSE"
     212            "IsolateTo" = "8:"
     213            }
    103214            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B95E7A2ED509F8B7340E8BB7DAFAAE6A"
    104215            {
     
    189300        "ProductName" = "8:PiwigoWPF"
    190301        "ProductCode" = "8:{1A1D38BF-DA5F-41C7-8311-4F356E4655AE}"
    191         "PackageCode" = "8:{22969C31-A115-45DC-B16F-88EDBB62AEC2}"
     302        "PackageCode" = "8:{7F5B26C0-3481-43E8-8FE3-37F9EBCA7496}"
    192303        "UpgradeCode" = "8:{D954E923-EA84-413E-AD67-D04E431ACE27}"
    193304        "AspNetVersion" = "8:4.0.30319.0"
  • extensions/PiwigoLib/PiwigoWpf/PiwigoWpf.csproj

    r12016 r12035  
    1212    <AssemblyName>PiwigoWpf</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile>
    15     </TargetFrameworkProfile>
     14    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
    1615    <FileAlignment>512</FileAlignment>
    1716    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
  • extensions/PiwigoLib/PiwigoWpf/app.config

    r12016 r12035  
    77  </configSections>
    88  <startup>
    9     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     9    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
    1010  </startup>
    1111  <userSettings>
Note: See TracChangeset for help on using the changeset viewer.