Skip to content

Commit

Permalink
update .net framework version
Browse files Browse the repository at this point in the history
  • Loading branch information
VladimirHot committed Apr 16, 2023
1 parent a9035e4 commit f811329
Show file tree
Hide file tree
Showing 66 changed files with 3,957 additions and 4,639 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Adding_a_Custom_Function_to_the_Designer</RootNamespace>
<AssemblyName>Adding_a_Custom_Function_to_the_Designer</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand Down Expand Up @@ -44,66 +44,58 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml.Linq" />
<Reference Include="LibExcel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.LibExcel.2022.4.1\lib\net452\LibExcel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Stimulsoft.Base, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Base.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Base.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Blockly, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Blockly.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Blockly.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Data, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Data.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Data.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Map, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Map.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Check, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.Check.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Map.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Check, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.Check.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Helper, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.Helper.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.Helper.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Mvc, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.Mvc.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.Mvc.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Web, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.Web.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.Web.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.WebDesign, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.WebDesign.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.WebDesign.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Svg, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Svg.2023.2.2\lib\net452\Stimulsoft.Svg.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Svg.2023.2.2\lib\net472\Stimulsoft.Svg.dll</HintPath>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="Reports\Invoice.mrt" />
<Content Include="Reports\MyInvoice.mrt" />
<None Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<Content Include="Localization\ar.xml" />
<Content Include="Localization\be.xml" />
<Content Include="Localization\bg.xml" />
Expand Down Expand Up @@ -143,6 +135,15 @@
<Content Include="Localization\vi.xml" />
<Content Include="Localization\zh-CHS.xml" />
<Content Include="Localization\zh-CHT.xml" />
<Content Include="Reports\Invoice.mrt" />
<Content Include="Reports\MyInvoice.mrt" />
<None Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Default.aspx" />
Expand Down
44 changes: 3 additions & 41 deletions Adding a Custom Function to the Designer/Web.config
Original file line number Diff line number Diff line change
@@ -1,49 +1,11 @@
<?xml version="1.0"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
https://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5" />
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.5"/>
<httpRuntime/>
<httpModules/>
<pages controlRenderingCompatibilityVersion="4.0"/>
<compilation debug="true" targetFramework="4.7.2" />
<httpRuntime targetFramework="4.7.2" />
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<modules/>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Base" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Check" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Mvc" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Web" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
10 changes: 6 additions & 4 deletions Adding a Custom Function to the Designer/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Stimulsoft.Reports.Engine" version="2023.2.2" targetFramework="net452" />
<package id="Stimulsoft.Reports.Web" version="2023.2.2" targetFramework="net452" />
<package id="Stimulsoft.Svg" version="2023.2.2" targetFramework="net452" />
<package id="Stimulsoft.LibExcel" version="2022.4.1" targetFramework="net452" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
<package id="Stimulsoft.LibExcel" version="2022.4.1" targetFramework="net472" />
<package id="Stimulsoft.Reports.Engine" version="2023.2.2" targetFramework="net472" />
<package id="Stimulsoft.Reports.Web" version="2023.2.2" targetFramework="net472" />
<package id="Stimulsoft.Svg" version="2023.2.2" targetFramework="net472" />
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net472" />
</packages>
61 changes: 31 additions & 30 deletions Adding a Font to the Resource/Adding a Font to the Resource.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Adding_a_Font_to_the_Resource</RootNamespace>
<AssemblyName>Adding_a_Font_to_the_Resource</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand Down Expand Up @@ -44,55 +44,56 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml.Linq" />
<Reference Include="LibExcel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.LibExcel.2022.4.1\lib\net452\LibExcel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Stimulsoft.Base, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Base.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Base.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Blockly, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Blockly.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Blockly.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Data, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Data.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Data.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Map, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Map.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Check, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.Check.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Map.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Check, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.Check.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Helper, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net452\Stimulsoft.Report.Helper.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Engine.2023.2.2\lib\net472\Stimulsoft.Report.Helper.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Mvc, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.Mvc.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.Mvc.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.Web, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.Web.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.Web.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Report.WebDesign, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net452\Stimulsoft.Report.WebDesign.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Reports.Web.2023.2.2\lib\net472\Stimulsoft.Report.WebDesign.dll</HintPath>
</Reference>
<Reference Include="Stimulsoft.Svg, Version=2023.2.2.0, Culture=neutral, PublicKeyToken=ebe6666cba19647a, processorArchitecture=MSIL">
<HintPath>..\packages\Stimulsoft.Svg.2023.2.2\lib\net452\Stimulsoft.Svg.dll</HintPath>
<HintPath>..\packages\Stimulsoft.Svg.2023.2.2\lib\net472\Stimulsoft.Svg.dll</HintPath>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="Fonts\Roboto-Black.ttf" />
Expand All @@ -103,6 +104,9 @@
<None Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Default.aspx" />
<Content Include="Localization\ar.xml" />
<Content Include="Localization\be.xml" />
<Content Include="Localization\bg.xml" />
Expand Down Expand Up @@ -142,9 +146,6 @@
<Content Include="Localization\vi.xml" />
<Content Include="Localization\zh-CHS.xml" />
<Content Include="Localization\zh-CHT.xml" />
</ItemGroup>
<ItemGroup>
<Content Include="Default.aspx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
Expand Down
44 changes: 3 additions & 41 deletions Adding a Font to the Resource/Web.config
Original file line number Diff line number Diff line change
@@ -1,49 +1,11 @@
<?xml version="1.0"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
https://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5" />
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.5"/>
<httpRuntime/>
<httpModules/>
<pages controlRenderingCompatibilityVersion="4.0"/>
<compilation debug="true" targetFramework="4.7.2" />
<httpRuntime targetFramework="4.7.2" />
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<modules/>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Base" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Check" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Mvc" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Stimulsoft.Report.Web" publicKeyToken="ebe6666cba19647a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2018.3.1.0" newVersion="2018.3.1.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading

0 comments on commit f811329

Please sign in to comment.