Skip to content

Commit ea388a9

Browse files
csharpfritzcsharpfritz
committed
Consolidated and fixed the BeforeWebForms project
1 parent 7b43169 commit ea388a9

File tree

113 files changed

+80
-39891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+80
-39891
lines changed

‎BlazorMeetsWebForms.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionInfo", "SolutionInf
3636
version.json = version.json
3737
EndProjectSection
3838
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeforeWebForms", "samples\BeforeWebForms2\BeforeWebForms.csproj", "{F3C9E926-380D-4363-9705-792C8BAF9E75}"
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeforeWebForms", "samples\BeforeWebForms\BeforeWebForms.csproj", "{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}"
4040
EndProject
4141
Global
4242
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -108,18 +108,18 @@ Global
108108
{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B}.Release|x64.Build.0 = Release|Any CPU
109109
{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B}.Release|x86.ActiveCfg = Release|Any CPU
110110
{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B}.Release|x86.Build.0 = Release|Any CPU
111-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|Any CPU.Build.0 = Debug|Any CPU
113-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|x64.ActiveCfg = Debug|Any CPU
114-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|x64.Build.0 = Debug|Any CPU
115-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|x86.ActiveCfg = Debug|Any CPU
116-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Debug|x86.Build.0 = Debug|Any CPU
117-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|Any CPU.ActiveCfg = Release|Any CPU
118-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|Any CPU.Build.0 = Release|Any CPU
119-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|x64.ActiveCfg = Release|Any CPU
120-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|x64.Build.0 = Release|Any CPU
121-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|x86.ActiveCfg = Release|Any CPU
122-
{F3C9E926-380D-4363-9705-792C8BAF9E75}.Release|x86.Build.0 = Release|Any CPU
111+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|x64.ActiveCfg = Debug|Any CPU
114+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|x64.Build.0 = Debug|Any CPU
115+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|x86.ActiveCfg = Debug|Any CPU
116+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Debug|x86.Build.0 = Debug|Any CPU
117+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|x64.ActiveCfg = Release|Any CPU
120+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|x64.Build.0 = Release|Any CPU
121+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|x86.ActiveCfg = Release|Any CPU
122+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7}.Release|x86.Build.0 = Release|Any CPU
123123
EndGlobalSection
124124
GlobalSection(SolutionProperties) = preSolution
125125
HideSolutionNode = FALSE
@@ -129,7 +129,7 @@ Global
129129
{6C602B37-5FC9-43FF-A3D8-C92B42D62F0D} = {240E45D9-B9FF-42E8-B0C1-332861E02DBF}
130130
{7218D3E2-38BD-429D-9D84-15E688BDC4A1} = {240E45D9-B9FF-42E8-B0C1-332861E02DBF}
131131
{1669CD22-5CCE-4D96-A02B-31D81B5EFB2B} = {240E45D9-B9FF-42E8-B0C1-332861E02DBF}
132-
{F3C9E926-380D-4363-9705-792C8BAF9E75} = {240E45D9-B9FF-42E8-B0C1-332861E02DBF}
132+
{CA277C6F-A3DD-4FAF-9B7C-56E7B844CEF7} = {240E45D9-B9FF-42E8-B0C1-332861E02DBF}
133133
EndGlobalSection
134134
GlobalSection(ExtensibilityGlobals) = postSolution
135135
SolutionGuid = {E288F9FB-039F-4718-8AEB-85F89B29EB4E}

‎samples/BeforeWebForms/BeforeWebForms.csproj‎

Lines changed: 65 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,9 +44,6 @@
4544
<WarningLevel>4</WarningLevel>
4645
</PropertyGroup>
4746
<ItemGroup>
48-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
50-
</Reference>
5147
<Reference Include="Microsoft.CSharp" />
5248
<Reference Include="System.ComponentModel.DataAnnotations" />
5349
<Reference Include="System" />
@@ -65,43 +61,44 @@
6561
<Reference Include="System.Web.DynamicData" />
6662
<Reference Include="System.Web.Entity" />
6763
<Reference Include="System.Web.ApplicationServices" />
68-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<Private>True</Private>
70-
<HintPath>..\..\src\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
71-
</Reference>
72-
<Reference Include="AspNet.ScriptManager.bootstrap">
73-
<HintPath>..\..\src\packages\AspNet.ScriptManager.bootstrap.3.4.1\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
74-
</Reference>
75-
<Reference Include="AspNet.ScriptManager.jQuery">
76-
<HintPath>..\..\src\packages\AspNet.ScriptManager.jQuery.3.4.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
77-
</Reference>
78-
<Reference Include="Microsoft.ScriptManager.MSAjax">
79-
<HintPath>..\..\src\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
80-
</Reference>
81-
<Reference Include="Microsoft.ScriptManager.WebForms">
82-
<HintPath>..\..\src\packages\Microsoft.AspNet.ScriptManager.WebForms.5.0.0\lib\net45\Microsoft.ScriptManager.WebForms.dll</HintPath>
83-
</Reference>
84-
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
85-
<HintPath>..\..\src\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Newtonsoft.Json">
88-
<HintPath>..\..\src\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
89-
</Reference>
90-
<Reference Include="WebGrease">
91-
<Private>True</Private>
92-
<HintPath>..\..\src\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
93-
</Reference>
94-
<Reference Include="Antlr3.Runtime">
95-
<Private>True</Private>
96-
<HintPath>..\..\src\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
97-
</Reference>
98-
<Reference Include="Microsoft.AspNet.Web.Optimization.WebForms">
99-
<Private>True</Private>
100-
<HintPath>..\..\src\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
101-
</Reference>
102-
<Reference Include="Microsoft.AspNet.FriendlyUrls">
103-
<HintPath>..\..\src\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
104-
</Reference>
64+
</ItemGroup>
65+
<ItemGroup>
66+
<PackageReference Include="Antlr3.Runtime">
67+
<Version>3.5.1</Version>
68+
</PackageReference>
69+
<PackageReference Include="AspNet.ScriptManager.bootstrap">
70+
<Version>4.4.1</Version>
71+
</PackageReference>
72+
<PackageReference Include="AspNet.ScriptManager.jQuery">
73+
<Version>3.4.1</Version>
74+
</PackageReference>
75+
<PackageReference Include="Microsoft.AspNet.FriendlyUrls.Core">
76+
<Version>1.0.2</Version>
77+
</PackageReference>
78+
<PackageReference Include="Microsoft.AspNet.ScriptManager.MSAjax">
79+
<Version>5.0.0</Version>
80+
</PackageReference>
81+
<PackageReference Include="Microsoft.AspNet.Web.Optimization">
82+
<Version>1.1.3</Version>
83+
</PackageReference>
84+
<PackageReference Include="Microsoft.AspNet.Web.Optimization.WebForms">
85+
<Version>1.1.3</Version>
86+
</PackageReference>
87+
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
88+
<Version>2.0.1</Version>
89+
</PackageReference>
90+
<PackageReference Include="Microsoft.ScriptManager.WebForms">
91+
<Version>1.0.1</Version>
92+
</PackageReference>
93+
<PackageReference Include="Microsoft.Web.Infrastructure">
94+
<Version>1.0.0</Version>
95+
</PackageReference>
96+
<PackageReference Include="Newtonsoft.Json">
97+
<Version>12.0.3</Version>
98+
</PackageReference>
99+
<PackageReference Include="WebGrease">
100+
<Version>1.6.0</Version>
101+
</PackageReference>
105102
</ItemGroup>
106103
<ItemGroup>
107104
<Content Include="Content\bootstrap-theme.css" />
@@ -114,6 +111,9 @@
114111
<Content Include="ControlSamples\DataList\StyleAttributes.aspx" />
115112
<Content Include="ControlSamples\DataList\FlowLayout.aspx" />
116113
<Content Include="ControlSamples\DataList\Default.aspx" />
114+
<Content Include="ControlSamples\GridView\AutoGeneratedColumns.aspx" />
115+
<Content Include="ControlSamples\GridView\Default.aspx" />
116+
<Content Include="ControlSamples\GridView\TemplateFields.aspx" />
117117
<Content Include="ControlSamples\ListView\Grouping.aspx" />
118118
<Content Include="ControlSamples\ListView\Default.aspx" />
119119
<Content Include="ControlSamples\ListView\ModelBinding.aspx" />
@@ -198,6 +198,28 @@
198198
<Compile Include="ControlSamples\DataList\Default.aspx.designer.cs">
199199
<DependentUpon>Default.aspx</DependentUpon>
200200
</Compile>
201+
<Compile Include="ControlSamples\GridView\AutoGeneratedColumns.aspx.cs">
202+
<DependentUpon>AutoGeneratedColumns.aspx</DependentUpon>
203+
<SubType>ASPXCodeBehind</SubType>
204+
</Compile>
205+
<Compile Include="ControlSamples\GridView\AutoGeneratedColumns.aspx.designer.cs">
206+
<DependentUpon>AutoGeneratedColumns.aspx</DependentUpon>
207+
</Compile>
208+
<Compile Include="ControlSamples\GridView\Customer.cs" />
209+
<Compile Include="ControlSamples\GridView\Default.aspx.cs">
210+
<DependentUpon>Default.aspx</DependentUpon>
211+
<SubType>ASPXCodeBehind</SubType>
212+
</Compile>
213+
<Compile Include="ControlSamples\GridView\Default.aspx.designer.cs">
214+
<DependentUpon>Default.aspx</DependentUpon>
215+
</Compile>
216+
<Compile Include="ControlSamples\GridView\TemplateFields.aspx.cs">
217+
<DependentUpon>TemplateFields.aspx</DependentUpon>
218+
<SubType>ASPXCodeBehind</SubType>
219+
</Compile>
220+
<Compile Include="ControlSamples\GridView\TemplateFields.aspx.designer.cs">
221+
<DependentUpon>TemplateFields.aspx</DependentUpon>
222+
</Compile>
201223
<Compile Include="ControlSamples\ListView\Grouping.aspx.cs">
202224
<DependentUpon>Grouping.aspx</DependentUpon>
203225
<SubType>ASPXCodeBehind</SubType>
@@ -318,14 +340,14 @@
318340
</FlavorProperties>
319341
</VisualStudio>
320342
</ProjectExtensions>
321-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
343+
<!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
322344
<PropertyGroup>
323345
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
324346
</PropertyGroup>
325347
<Error Condition="!Exists('..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
326348
<Error Condition="!Exists('..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
327349
</Target>
328-
<Import Project="..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
350+
<Import Project="..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\src\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />-->
329351
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
330352
Other similar extension points exist, see Microsoft.Common.targets.
331353
<Target Name="BeforeBuild">

samples/BeforeWebForms2/ControlSamples/GridView/AutoGeneratedColumns.aspx renamed to samples/BeforeWebForms/ControlSamples/GridView/AutoGeneratedColumns.aspx

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/AutoGeneratedColumns.aspx.cs renamed to samples/BeforeWebForms/ControlSamples/GridView/AutoGeneratedColumns.aspx.cs

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/AutoGeneratedColumns.aspx.designer.cs renamed to samples/BeforeWebForms/ControlSamples/GridView/AutoGeneratedColumns.aspx.designer.cs

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/Customer.cs renamed to samples/BeforeWebForms/ControlSamples/GridView/Customer.cs

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/Default.aspx renamed to samples/BeforeWebForms/ControlSamples/GridView/Default.aspx

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/Default.aspx.cs renamed to samples/BeforeWebForms/ControlSamples/GridView/Default.aspx.cs

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/Default.aspx.designer.cs renamed to samples/BeforeWebForms/ControlSamples/GridView/Default.aspx.designer.cs

File renamed without changes.

samples/BeforeWebForms2/ControlSamples/GridView/TemplateFields.aspx renamed to samples/BeforeWebForms/ControlSamples/GridView/TemplateFields.aspx

File renamed without changes.

0 commit comments

Comments
 (0)