Skip to content

Commit a7a6529

Browse files
[Compiler] Version number changed. Also changed from .Net 7.0.0 for tools to .Net 6.0.0 and added setting to prevent certain warnings during build.
Also added dependency to csc.exe for Xsharp.VSParser to control the build order
1 parent 5efb026 commit a7a6529

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

Roslyn/eng/Versions.props

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
<MicrosoftNetCompilersToolsetVersion>3.11.0</MicrosoftNetCompilersToolsetVersion>
2727
</PropertyGroup>
2828
<PropertyGroup>
29+
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
2930
<!-- Versions used by several individual references below -->
3031
<RoslynDiagnosticsNugetPackageVersion>3.3.2-beta1.20562.1</RoslynDiagnosticsNugetPackageVersion>
31-
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
32+
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
3233
<MicrosoftCodeAnalysisTestingVersion>1.0.1</MicrosoftCodeAnalysisTestingVersion>
3334
<CodeStyleAnalyzerVersion>3.8.0</CodeStyleAnalyzerVersion>
3435
<VisualStudioEditorPackagesVersion>16.8.181</VisualStudioEditorPackagesVersion>
35-
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
36+
<ILToolsPackageVersion>5.0.0</ILToolsPackageVersion>
3637
<MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>16.9.150</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
37-
<MicrosoftVisualStudioShellPackagesVersion>16.8.30406.65-pre</MicrosoftVisualStudioShellPackagesVersion>
38+
<MicrosoftVisualStudioShellPackagesVersion>16.8.30709.123</MicrosoftVisualStudioShellPackagesVersion>
3839
<!-- The version of Roslyn we build Source Generators against that are built in this
3940
repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
4041
but not higher than our minimum dogfoodable Visual Studio version, or else

XSharp/Compiler.sln

+3
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharpEvaluator", "src\Comp
132132
EndProjectSection
133133
EndProject
134134
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharpVSParser", "src\Compiler\XSharpCodeAnalysis\XSharpVSParser.csproj", "{9E6B79C4-43FB-47C9-8128-7EEBC1203512}"
135+
ProjectSection(ProjectDependencies) = postProject
136+
{4B45CA0C-03A0-400F-B454-3D4BCB16AF38} = {4B45CA0C-03A0-400F-B454-3D4BCB16AF38}
137+
EndProjectSection
135138
EndProject
136139
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6E4153BF-B4D2-433A-89F7-C0284F0F1395}"
137140
EndProject

XSharp/docs/Topics/VersionHistory.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?xml-stylesheet type="text/xsl" href="../helpproject.xsl" ?>
3-
<topic template="Default" modified="2023-02-15T14:13:48.706+01:00" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
3+
<topic template="Default" modified="2023-02-21T16:20:15.062+01:00" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
44
<title>Version History</title>
55
<keywords>
66
<keyword>/shared</keyword>
@@ -16,7 +16,7 @@
1616
<para styleclass="Body Text" style="tabstops:96px left,144px left,240px left,488px left,1998px left ;">Note: When an item has a matching GitHub ticket then the ticket number is behind the item in parentheses prefixed with #. You can find these tickets by going to: <br/>https://github.com/X-Sharp/XSharpPublic/issues/<text style="font-weight:bold;">nnn</text> where <text style="font-weight:bold;">nnn</text> is the ticket number.<br/>If you find an issue in X# we recommend that you report it on GitHub. You will be notified of the progress on the work on your issue and the ticket number will be included in the documentation of new builds from now on (April 2021).</para>
1717
<para styleclass="Body Text"></para>
1818
<para styleclass="Body Text"></para>
19-
<para styleclass="Heading1">Changes in 2.15.0.0</para>
19+
<para styleclass="Heading1">Changes in 2.15.0.3</para>
2020
<para styleclass="Heading2">Compiler</para>
2121
<para styleclass="" style="text-align:left; text-indent:0px; margin-top:8px; margin-right:0px; margin-bottom:0px; margin-left:0px; line-height:1.00; background-color:transparent; white-space:normal; page-break-inside:avoid; page-break-after:avoid; border:none; tabstops:none;"><text styleclass="" style="font-family:Arial; font-size:12pt; font-weight:bold; color:#00a8d2;">New Features</text></para>
2222
<list id="0" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
@@ -38,11 +38,14 @@
3838
<li styleclass="Body Text">Fixed incorrect ambiguous call error with OBJECT/IntPtr parameters (#1197)</li>
3939
<li styleclass="Body Text">Fixed erratic debugging while stepping over code in some cases (#1200, #1202)</li>
4040
<li styleclass="Body Text">Fixed a problem where a missing &quot;end keyword&quot;, such as ENDIF, NEXT, ENDDO was not reported when the code between the start and end contained a compiler warning (#1203)</li>
41+
<li styleclass="Body Text">Fixed a problem in the build system where sometimes an error message about an incorrect &quot;RuntimeIdentifier&quot; was shown</li>
4142
</list>
4243
<para styleclass="Heading2">Runtime</para>
4344
<para styleclass="Heading3">Bug fixes</para>
4445
<list id="1" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
4546
<li styleclass="Body Text">Fixed runtime error in DBSort() (#1196)</li>
47+
<li styleclass="Body Text">Fixed error in the ConvertFromCodePageToCodePage function</li>
48+
<li styleclass="Body Text">A Changed in the startup code for the XSharp.RuntimeState could lead to incorrect codepages</li>
4649
</list>
4750
<para styleclass="Heading2">Visual Studio integration</para>
4851
<para styleclass="" style="text-align:left; text-indent:0px; margin-top:8px; margin-right:0px; margin-bottom:0px; margin-left:0px; line-height:1.00; background-color:transparent; white-space:normal; page-break-inside:avoid; page-break-after:avoid; border:none; tabstops:none;"><text styleclass="" style="font-family:Arial; font-size:12pt; font-weight:bold; color:#00a8d2;">New Features</text></para>
@@ -74,6 +77,7 @@
7477
<li styleclass="Body Text">Undoing a case synchronization in the VS editor was not working, because the editor would immediately synchronize the case again (#1205)</li>
7578
<li styleclass="Body Text">Rebuilding the intellisense database no longer restarts Visual Studio (#1206)</li>
7679
<li styleclass="Body Text">Now the VO Menu Editor uses the same menu item DEFINE values, as those used in the original VO app (re-porting of the app is necessary for this to work) (#1207)</li>
80+
<li styleclass="Body Text">A Change to our project system and language service could lead to broken &quot;Find in Files&quot; functionality in some versions of Visual Studio. &#160;This has been fixed.</li>
7781
</list>
7882
<para styleclass="Heading1">Changes in 2.14.0.2, 3 &amp; 4</para>
7983
<para styleclass="Heading2">Visual Studio Integration</para>

XSharp/eng/Versions.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See License.txt in the project root for license information.
1414
<MajorVersion>2</MajorVersion>
1515
<MinorVersion>15</MinorVersion>
1616
<PatchVersion>0</PatchVersion>
17-
<PreReleaseVersionLabel>4</PreReleaseVersionLabel>
17+
<PreReleaseVersionLabel>3</PreReleaseVersionLabel>
1818
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1919
<!--
2020
By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".
@@ -29,14 +29,15 @@ See License.txt in the project root for license information.
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Versions used by several individual references below -->
32+
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
3233
<RoslynDiagnosticsNugetPackageVersion>3.3.2</RoslynDiagnosticsNugetPackageVersion>
33-
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
34+
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
3435
<MicrosoftCodeAnalysisTestingVersion>1.0.1</MicrosoftCodeAnalysisTestingVersion>
3536
<CodeStyleAnalyzerVersion>3.8.0</CodeStyleAnalyzerVersion>
3637
<VisualStudioEditorPackagesVersion>16.8.181</VisualStudioEditorPackagesVersion>
37-
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
38+
<ILToolsPackageVersion>5.0.0</ILToolsPackageVersion>
3839
<MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>16.9.150</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
39-
<MicrosoftVisualStudioShellPackagesVersion>16.8.30406.65-pre</MicrosoftVisualStudioShellPackagesVersion>
40+
<MicrosoftVisualStudioShellPackagesVersion>16.8.30709.123</MicrosoftVisualStudioShellPackagesVersion>
4041
<!-- The version of Roslyn we build Source Generators against that are built in this
4142
repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
4243
but not higher than our minimum dogfoodable Visual Studio version, or else

XSharp/src/Common/BuildNumber.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#ifdef RUNTIME
1414
#define VERSION_NUMBER "2.6.0.0"
1515
#else
16-
#define VERSION_NUMBER "2.15.0.1"
16+
#define VERSION_NUMBER "2.15.0.3"
1717
#endif
1818

1919
// This is the file version number, which is ignored by .NET but used by Windows installer to determine
2020
// whether one file is newer than another.
2121
// This typically would change if we're generating a patch, otherwise it should be the same as VERSION_NUMBER
22-
#define FILEVERSION_NUMBER "2.15.0.1"
22+
#define FILEVERSION_NUMBER "2.15.0.3"
2323
#define INFORMATIONAL_NUMBER "2.15 GA"
2424

2525
#ifdef __DEBUG__

XSharp/src/Common/Constants.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ internal static partial class Constants
1616
#if RUNTIME
1717
internal const string Version = "2.6.0.0";
1818
#else
19-
internal const string Version = "2.15.0.1";
19+
internal const string Version = "2.15.0.3";
2020
#endif
21-
internal const string FileVersion = "2.15.0.1";
21+
internal const string FileVersion = "2.15.0.3";
2222
internal const string ProductVersion = "2.15 GA";
2323
internal const string PublicKey = "ed555a0467764586";
2424
internal const string Copyright = "Copyright © XSharp BV 2015-2023";

0 commit comments

Comments
 (0)