Skip to content

Commit ca1abf6

Browse files
xairrickxairrick
committed
converted controls to v.4.5.2
added error trap for missing WIF 3.5 removed .NET 4.5 requirement in the manifest (it was causing installation failures)
1 parent b64fd24 commit ca1abf6

File tree

5 files changed

+221
-217
lines changed

5 files changed

+221
-217
lines changed

‎CrmCodeGenerator.Controls/CrmCodeGenerator.Controls.csproj

+112-109
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,113 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{CE17A54E-0661-429F-AFDC-272E8668B14E}</ProjectGuid>
9-
<OutputType>library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>CrmCodeGenerator.Controls</RootNamespace>
12-
<AssemblyName>CrmCodeGenerator.Controls</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<WarningLevel>4</WarningLevel>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<SignAssembly>true</SignAssembly>
38-
</PropertyGroup>
39-
<PropertyGroup>
40-
<AssemblyOriginatorKeyFile>SigningKey.snk</AssemblyOriginatorKeyFile>
41-
</PropertyGroup>
42-
<ItemGroup>
43-
<Reference Include="System" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Xml" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Core" />
48-
<Reference Include="System.Xml.Linq" />
49-
<Reference Include="System.Data.DataSetExtensions" />
50-
<Reference Include="System.Xaml">
51-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
52-
</Reference>
53-
<Reference Include="WindowsBase" />
54-
<Reference Include="PresentationCore" />
55-
<Reference Include="PresentationFramework" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<Page Include="FileSelector.xaml">
59-
<Generator>MSBuild:Compile</Generator>
60-
<SubType>Designer</SubType>
61-
</Page>
62-
<Page Include="MultiSelectComboBox.xaml">
63-
<Generator>MSBuild:Compile</Generator>
64-
<SubType>Designer</SubType>
65-
</Page>
66-
<Compile Include="FileSelector.xaml.cs">
67-
<DependentUpon>FileSelector.xaml</DependentUpon>
68-
</Compile>
69-
<Compile Include="MultiSelectComboBox.xaml.cs">
70-
<DependentUpon>MultiSelectComboBox.xaml</DependentUpon>
71-
<SubType>Code</SubType>
72-
</Compile>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<Compile Include="Properties\AssemblyInfo.cs">
76-
<SubType>Code</SubType>
77-
</Compile>
78-
<Compile Include="Properties\Resources.Designer.cs">
79-
<AutoGen>True</AutoGen>
80-
<DesignTime>True</DesignTime>
81-
<DependentUpon>Resources.resx</DependentUpon>
82-
</Compile>
83-
<Compile Include="Properties\Settings.Designer.cs">
84-
<AutoGen>True</AutoGen>
85-
<DependentUpon>Settings.settings</DependentUpon>
86-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
87-
</Compile>
88-
<EmbeddedResource Include="Properties\Resources.resx">
89-
<Generator>ResXFileCodeGenerator</Generator>
90-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
91-
</EmbeddedResource>
92-
<None Include="Properties\Settings.settings">
93-
<Generator>SettingsSingleFileGenerator</Generator>
94-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
95-
</None>
96-
<AppDesigner Include="Properties\" />
97-
<None Include="SigningKey.snk" />
98-
</ItemGroup>
99-
<ItemGroup>
100-
<Resource Include="Browse.png" />
101-
</ItemGroup>
102-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
103-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
104-
Other similar extension points exist, see Microsoft.Common.targets.
105-
<Target Name="BeforeBuild">
106-
</Target>
107-
<Target Name="AfterBuild">
108-
</Target>
109-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{CE17A54E-0661-429F-AFDC-272E8668B14E}</ProjectGuid>
9+
<OutputType>library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>CrmCodeGenerator.Controls</RootNamespace>
12+
<AssemblyName>CrmCodeGenerator.Controls</AssemblyName>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
16+
<FileAlignment>512</FileAlignment>
17+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
18+
<WarningLevel>4</WarningLevel>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>bin\Debug\</OutputPath>
25+
<DefineConstants>DEBUG;TRACE</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<Prefer32Bit>false</Prefer32Bit>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<DebugType>pdbonly</DebugType>
32+
<Optimize>true</Optimize>
33+
<OutputPath>bin\Release\</OutputPath>
34+
<DefineConstants>TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<SignAssembly>true</SignAssembly>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<AssemblyOriginatorKeyFile>SigningKey.snk</AssemblyOriginatorKeyFile>
44+
</PropertyGroup>
45+
<ItemGroup>
46+
<Reference Include="System" />
47+
<Reference Include="System.Data" />
48+
<Reference Include="System.Xml" />
49+
<Reference Include="Microsoft.CSharp" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="System.Xml.Linq" />
52+
<Reference Include="System.Data.DataSetExtensions" />
53+
<Reference Include="System.Xaml">
54+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
55+
</Reference>
56+
<Reference Include="WindowsBase" />
57+
<Reference Include="PresentationCore" />
58+
<Reference Include="PresentationFramework" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<Page Include="FileSelector.xaml">
62+
<Generator>MSBuild:Compile</Generator>
63+
<SubType>Designer</SubType>
64+
</Page>
65+
<Page Include="MultiSelectComboBox.xaml">
66+
<Generator>MSBuild:Compile</Generator>
67+
<SubType>Designer</SubType>
68+
</Page>
69+
<Compile Include="FileSelector.xaml.cs">
70+
<DependentUpon>FileSelector.xaml</DependentUpon>
71+
</Compile>
72+
<Compile Include="MultiSelectComboBox.xaml.cs">
73+
<DependentUpon>MultiSelectComboBox.xaml</DependentUpon>
74+
<SubType>Code</SubType>
75+
</Compile>
76+
</ItemGroup>
77+
<ItemGroup>
78+
<Compile Include="Properties\AssemblyInfo.cs">
79+
<SubType>Code</SubType>
80+
</Compile>
81+
<Compile Include="Properties\Resources.Designer.cs">
82+
<AutoGen>True</AutoGen>
83+
<DesignTime>True</DesignTime>
84+
<DependentUpon>Resources.resx</DependentUpon>
85+
</Compile>
86+
<Compile Include="Properties\Settings.Designer.cs">
87+
<AutoGen>True</AutoGen>
88+
<DependentUpon>Settings.settings</DependentUpon>
89+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
90+
</Compile>
91+
<EmbeddedResource Include="Properties\Resources.resx">
92+
<Generator>ResXFileCodeGenerator</Generator>
93+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
94+
</EmbeddedResource>
95+
<None Include="Properties\Settings.settings">
96+
<Generator>SettingsSingleFileGenerator</Generator>
97+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
98+
</None>
99+
<AppDesigner Include="Properties\" />
100+
<None Include="SigningKey.snk" />
101+
</ItemGroup>
102+
<ItemGroup>
103+
<Resource Include="Browse.png" />
104+
</ItemGroup>
105+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
107+
Other similar extension points exist, see Microsoft.Common.targets.
108+
<Target Name="BeforeBuild">
109+
</Target>
110+
<Target Name="AfterBuild">
111+
</Target>
112+
-->
110113
</Project>

‎CrmCodeGenerator.Controls/Properties/Resources.Designer.cs

+63-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)