Skip to content

Commit 3ac09a9

Browse files
furmanggfurmangg
committed
fixing bug where reports were crashing VS2015
getting reports working in SQL2017 for VS2015
1 parent 26588af commit 3ac09a9

5 files changed

Lines changed: 152 additions & 49 deletions

File tree

‎SQL2016_BidsHelper.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -685,89 +685,89 @@
685685
<Private>False</Private>
686686
</Reference>
687687
<Reference Include="Microsoft.AnalysisServices.BackEnd">
688-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.BackEnd.dll</HintPath>
688+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.BackEnd.dll</HintPath>
689689
<Private>False</Private>
690690
</Reference>
691691
<Reference Include="Microsoft.AnalysisServices.Common.FrontEnd">
692-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Common.FrontEnd.dll</HintPath>
692+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Common.FrontEnd.dll</HintPath>
693693
<Private>False</Private>
694694
</Reference>
695695
<Reference Include="Microsoft.AnalysisServices.MPFProjectBase">
696-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.MPFProjectBase.dll</HintPath>
696+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.MPFProjectBase.dll</HintPath>
697697
<Private>False</Private>
698698
</Reference>
699699
<Reference Include="Microsoft.AnalysisServices.Project">
700-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Project.DLL</HintPath>
700+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Project.DLL</HintPath>
701701
<Private>False</Private>
702702
</Reference>
703703
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
704704
<SpecificVersion>False</SpecificVersion>
705-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Tabular.DLL</HintPath>
705+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Tabular.DLL</HintPath>
706706
<Private>False</Private>
707707
</Reference>
708708
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
709709
<SpecificVersion>False</SpecificVersion>
710-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Tabular.Json.DLL</HintPath>
710+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Tabular.Json.DLL</HintPath>
711711
<Private>False</Private>
712712
</Reference>
713713
<Reference Include="Microsoft.AnalysisServices.VSHost">
714-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.VSHost.dll</HintPath>
714+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.VSHost.dll</HintPath>
715715
<Private>False</Private>
716716
</Reference>
717717
<Reference Include="Microsoft.DataTransformationServices.Controls, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
718718
<SpecificVersion>True</SpecificVersion>
719-
<HintPath>DLLs\SQL2016\References\Microsoft.DataTransformationServices.Controls.DLL</HintPath>
719+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataTransformationServices.Controls.DLL</HintPath>
720720
<Private>False</Private>
721721
</Reference>
722722
<Reference Include="Microsoft.DataTransformationServices.Design">
723-
<HintPath>DLLs\SQL2016\References\Microsoft.DataTransformationServices.Design.DLL</HintPath>
723+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataTransformationServices.Design.DLL</HintPath>
724724
<Private>False</Private>
725725
</Reference>
726726
<Reference Include="Microsoft.DataTransformationServices.VsIntegration">
727-
<HintPath>DLLs\SQL2016\References\Microsoft.DataTransformationServices.VsIntegration.DLL</HintPath>
727+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataTransformationServices.VsIntegration.DLL</HintPath>
728728
<Private>False</Private>
729729
<EmbedInteropTypes>False</EmbedInteropTypes>
730730
</Reference>
731731
<Reference Include="Microsoft.ReportViewer.Common, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
732-
<HintPath>DLLs\SQL2016\References\Microsoft.ReportViewer.Common.dll</HintPath>
732+
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.Common.dll</HintPath>
733733
<Private>False</Private>
734734
</Reference>
735735
<Reference Include="Microsoft.ReportViewer.DataVisualization, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
736-
<HintPath>DLLs\SQL2016\References\Microsoft.ReportViewer.DataVisualization.DLL</HintPath>
736+
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.DataVisualization.DLL</HintPath>
737737
<Private>False</Private>
738738
</Reference>
739739
<Reference Include="Microsoft.ReportViewer.Design, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
740-
<HintPath>DLLs\SQL2016\References\Microsoft.ReportViewer.Design.DLL</HintPath>
740+
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.Design.DLL</HintPath>
741741
<Private>False</Private>
742742
</Reference>
743743
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
744-
<HintPath>DLLs\SQL2016\References\Microsoft.ReportViewer.ProcessingObjectModel.DLL</HintPath>
744+
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.ProcessingObjectModel.DLL</HintPath>
745745
<Private>False</Private>
746746
</Reference>
747747
<Reference Include="Microsoft.ReportViewer.WinForms, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
748-
<HintPath>DLLs\SQL2016\References\Microsoft.ReportViewer.WinForms.DLL</HintPath>
748+
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.WinForms.dll</HintPath>
749749
<Private>False</Private>
750750
</Reference>
751751
<Reference Include="Microsoft.SqlServer.DlgGrid, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
752752
<SpecificVersion>True</SpecificVersion>
753-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.DlgGrid.dll</HintPath>
753+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.DlgGrid.dll</HintPath>
754754
<Private>False</Private>
755755
</Reference>
756756
<Reference Include="Microsoft.SqlServer.Dts.Design, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
757757
<SpecificVersion>True</SpecificVersion>
758-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.Dts.Design.dll</HintPath>
758+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.Dts.Design.dll</HintPath>
759759
<Private>False</Private>
760760
</Reference>
761761
<Reference Include="Microsoft.SQLServer.DTSPipelineWrap, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
762762
<SpecificVersion>True</SpecificVersion>
763763
<EmbedInteropTypes>False</EmbedInteropTypes>
764-
<HintPath>DLLs\SQL2016\References\Microsoft.SQLServer.DTSPipelineWrap.dll</HintPath>
764+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SQLServer.DTSPipelineWrap.dll</HintPath>
765765
<Private>False</Private>
766766
</Reference>
767767
<Reference Include="Microsoft.SqlServer.DTSRuntimeWrap, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=x86">
768768
<SpecificVersion>True</SpecificVersion>
769769
<EmbedInteropTypes>False</EmbedInteropTypes>
770-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.DTSRuntimeWrap.dll</HintPath>
770+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.DTSRuntimeWrap.dll</HintPath>
771771
<Private>False</Private>
772772
</Reference>
773773
<Reference Include="Microsoft.SqlServer.ExecPackageTaskWrap, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
@@ -777,48 +777,48 @@
777777
</Reference>
778778
<Reference Include="Microsoft.SqlServer.Graph, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
779779
<SpecificVersion>False</SpecificVersion>
780-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.Graph.dll</HintPath>
780+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.Graph.dll</HintPath>
781781
<Private>False</Private>
782782
</Reference>
783783
<Reference Include="Microsoft.SqlServer.IntegrationServices.Design">
784-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.IntegrationServices.Design.dll</HintPath>
784+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.IntegrationServices.Design.dll</HintPath>
785785
<Private>False</Private>
786786
</Reference>
787787
<Reference Include="Microsoft.SqlServer.IntegrationServices.Graph">
788-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.IntegrationServices.Graph.dll</HintPath>
788+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.IntegrationServices.Graph.dll</HintPath>
789789
<Private>False</Private>
790790
</Reference>
791791
<Reference Include="Microsoft.SqlServer.ManagedDTS, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
792792
<SpecificVersion>False</SpecificVersion>
793-
<HintPath>DLLs\SQL2016\References\Microsoft.SqlServer.ManagedDTS.dll</HintPath>
793+
<HintPath>DLLs\SQL2016\Reference\Microsoft.SqlServer.ManagedDTS.dll</HintPath>
794794
<Private>False</Private>
795795
</Reference>
796796
<Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
797797
<SpecificVersion>False</SpecificVersion>
798-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
798+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
799799
<Private>False</Private>
800800
</Reference>
801801
<Reference Include="Microsoft.AnalysisServices.Controls">
802-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Controls.DLL</HintPath>
802+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Controls.DLL</HintPath>
803803
<Private>False</Private>
804804
</Reference>
805805
<Reference Include="Microsoft.AnalysisServices.Design">
806-
<HintPath>DLLs\SQL2016\References\Microsoft.AnalysisServices.Design.DLL</HintPath>
806+
<HintPath>DLLs\SQL2016\Reference\Microsoft.AnalysisServices.Design.DLL</HintPath>
807807
<Private>False</Private>
808808
</Reference>
809809
<Reference Include="Microsoft.Build.Framework" />
810810
<Reference Include="Microsoft.CSharp" />
811811
<Reference Include="Microsoft.DataWarehouse">
812-
<HintPath>DLLs\SQL2016\References\Microsoft.DataWarehouse.DLL</HintPath>
812+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataWarehouse.DLL</HintPath>
813813
<Private>False</Private>
814814
</Reference>
815815
<Reference Include="Microsoft.DataWarehouse.Interfaces, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
816816
<SpecificVersion>False</SpecificVersion>
817-
<HintPath>DLLs\SQL2016\References\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
817+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
818818
<Private>False</Private>
819819
</Reference>
820820
<Reference Include="Microsoft.DataWarehouse.VsIntegration">
821-
<HintPath>DLLs\SQL2016\References\Microsoft.DataWarehouse.VsIntegration.DLL</HintPath>
821+
<HintPath>DLLs\SQL2016\Reference\Microsoft.DataWarehouse.VsIntegration.DLL</HintPath>
822822
<Private>False</Private>
823823
</Reference>
824824
<Reference Include="Microsoft.VisualBasic" />

‎SQL2017_BidsHelper.csproj‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,11 @@
520520
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.AppLocal.AdomdClient.dll" />
521521
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.Server.Tabular.dll" />
522522
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.Server.Tabular.Json.dll" />
523+
<Content Include="DLLs\SQL2017\Reference\Microsoft.ReportViewer.Common.AppLocal.dll" />
524+
<Content Include="DLLs\SQL2017\Reference\Microsoft.ReportViewer.DataVisualization.AppLocal.dll" />
525+
<Content Include="DLLs\SQL2017\Reference\Microsoft.ReportViewer.Design.AppLocal.dll" />
526+
<Content Include="DLLs\SQL2017\Reference\Microsoft.ReportViewer.ProcessingObjectModel.AppLocal.dll" />
527+
<Content Include="DLLs\SQL2017\Reference\Microsoft.ReportViewer.Winforms.AppLocal.dll" />
523528
<Content Include="DLLs\SQL2017\Reference\Microsoft.SqlServer.GridControl.dll" />
524529
<Content Include="License.rtf">
525530
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -735,24 +740,24 @@
735740
<Private>False</Private>
736741
<EmbedInteropTypes>False</EmbedInteropTypes>
737742
</Reference>
738-
<Reference Include="Microsoft.ReportViewer.Common">
739-
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.Common.dll</HintPath>
743+
<Reference Include="Microsoft.ReportViewer.Common.AppLocal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
744+
<HintPath>DLLs\SQL2017\Reference\Microsoft.ReportViewer.Common.AppLocal.dll</HintPath>
740745
<Private>False</Private>
741746
</Reference>
742-
<Reference Include="Microsoft.ReportViewer.DataVisualization">
743-
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.DataVisualization.DLL</HintPath>
747+
<Reference Include="Microsoft.ReportViewer.DataVisualization.AppLocal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
748+
<HintPath>DLLs\SQL2017\Reference\Microsoft.ReportViewer.DataVisualization.AppLocal.dll</HintPath>
744749
<Private>False</Private>
745750
</Reference>
746-
<Reference Include="Microsoft.ReportViewer.Design">
747-
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.Design.DLL</HintPath>
751+
<Reference Include="Microsoft.ReportViewer.Design.AppLocal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
752+
<HintPath>DLLs\SQL2017\Reference\Microsoft.ReportViewer.Design.AppLocal.dll</HintPath>
748753
<Private>False</Private>
749754
</Reference>
750-
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel">
751-
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.ProcessingObjectModel.DLL</HintPath>
755+
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel.AppLocal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
756+
<HintPath>DLLs\SQL2017\Reference\Microsoft.ReportViewer.ProcessingObjectModel.AppLocal.dll</HintPath>
752757
<Private>False</Private>
753758
</Reference>
754-
<Reference Include="Microsoft.ReportViewer.WinForms">
755-
<HintPath>DLLs\SQL2016\Reference\Microsoft.ReportViewer.WinForms.DLL</HintPath>
759+
<Reference Include="Microsoft.ReportViewer.Winforms.AppLocal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
760+
<HintPath>DLLs\SQL2017\Reference\Microsoft.ReportViewer.Winforms.AppLocal.dll</HintPath>
756761
<Private>False</Private>
757762
</Reference>
758763
<Reference Include="Microsoft.SqlServer.DlgGrid, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">

‎core/ReportViewerForm.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)