Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
4031a3d
comment out news feed
MakiWolf Jun 20, 2023
5746d75
comment out
MakiWolf Jul 23, 2023
5cadc4b
comment out unit tests
MakiWolf Jul 23, 2023
ebba3b8
formating
MakiWolf Jul 24, 2023
d4a0fdf
Merge branch 'dotdevelop:main' into nugetpackageremove
MakiWolf Aug 16, 2023
0f2c1e9
removefeed
MakiWolf Aug 21, 2023
de89f54
deleteemptynewsfile
MakiWolf Aug 21, 2023
d379f0f
Merge branch 'dotdevelop:main' into nugetpackageremove
MakiWolf Aug 27, 2023
e26105e
net7
MakiWolf Aug 30, 2023
67ac368
net 8 and 7
MakiWolf Aug 30, 2023
96c551f
Update README.md
MakiWolf Aug 31, 2023
6f816fe
Update Building.md
MakiWolf Aug 31, 2023
368a17f
Update README.md
MakiWolf Aug 31, 2023
0fd5519
add templates
MakiWolf Sep 1, 2023
0c71deb
add 8
MakiWolf Sep 1, 2023
99d320b
fix typo
MakiWolf Sep 2, 2023
c732683
Merge pull request #1 from MakiWolf/removewelcomepagefeed
MakiWolf Sep 2, 2023
8d817e4
Merge pull request #2 from MakiWolf/nugetpackageremove
MakiWolf Sep 2, 2023
41efdea
Merge pull request #3 from MakiWolf/removeemptynewsfile
MakiWolf Sep 2, 2023
00c4167
Merge pull request #4 from MakiWolf/readme
MakiWolf Sep 2, 2023
faa8c61
Revert "Readme"
MakiWolf Sep 2, 2023
e81f34f
Merge pull request #5 from MakiWolf/revert-4-readme
MakiWolf Sep 2, 2023
c9376c2
Merge pull request #6 from MakiWolf/readme
MakiWolf Sep 2, 2023
da98a00
Merge pull request #7 from MakiWolf/net7
MakiWolf Sep 2, 2023
d999e0d
new versions
MakiWolf Sep 3, 2023
4bcbd5a
update
MakiWolf Sep 4, 2023
30723ae
update cecil
MakiWolf Sep 4, 2023
a048061
comment out other sources
MakiWolf Sep 4, 2023
8d28908
revert
MakiWolf Sep 4, 2023
470a238
comment out deprecated package
MakiWolf Sep 4, 2023
8ff3e4f
Merge pull request #8 from MakiWolf/nugetpackageremove
MakiWolf Sep 5, 2023
4e7690c
Merge pull request #9 from MakiWolf/no-news-found-error
MakiWolf Sep 5, 2023
d7ed83d
Merge branch 'testbranch' into updatenugetversions
MakiWolf Sep 5, 2023
563b8fb
update
MakiWolf Sep 13, 2023
d21d935
Merge branch 'dotdevelop:main' into updatenugetversions
MakiWolf Sep 13, 2023
1925265
Merge pull request #11 from MakiWolf/updatenugetversions
MakiWolf Sep 14, 2023
1dbe28e
Update .gitmodules
MakiWolf Oct 8, 2023
42ccf5c
Update .gitmodules
MakiWolf Oct 8, 2023
d8a3fdf
update submodules
MakiWolf Oct 8, 2023
65ad1bb
Update .gitmodules
MakiWolf Oct 8, 2023
d78f2c4
update submodule
MakiWolf Oct 8, 2023
87a3dbf
Revert "update submodules"
MakiWolf Oct 9, 2023
563643a
update
MakiWolf Oct 9, 2023
730f431
update nrefactory
MakiWolf Oct 9, 2023
e32de08
update mono tools
MakiWolf Oct 9, 2023
1717ed9
update guiunit
MakiWolf Oct 10, 2023
952d736
add start script
MakiWolf Oct 21, 2023
e988bec
Merge pull request #12 from MakiWolf/removevseditor
MakiWolf Nov 13, 2023
e22205a
Merge branch 'dotdevelop:main' into test
MakiWolf Nov 24, 2023
9b0f8e3
Merge branch 'test' into maintest
MakiWolf Nov 26, 2023
5584d04
update Mono.TextTemplating
MakiWolf Dec 1, 2023
cd8aea4
update
MakiWolf Dec 1, 2023
8e3faab
update
MakiWolf Dec 1, 2023
1d06aa0
update
MakiWolf Dec 1, 2023
326e03f
Merge pull request #15 from MakiWolf/update-Mono.TextTemplating
MakiWolf Dec 1, 2023
bbda161
update
MakiWolf Dec 1, 2023
e381d2d
update nuget
MakiWolf Dec 2, 2023
905c996
Merge pull request #16 from MakiWolf/nugetbinary
MakiWolf Dec 4, 2023
3b53ffb
Merge branch 'maintest' into update-mono-text-templating
MakiWolf Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
branch = dotdevelop
[submodule "main/external/Samsung.Netcoredbg"]
path = main/external/Samsung.Netcoredbg
url = https://github.com/dotdevelop/netcoredbg.git
branch = dotdevelop
url = https://github.com/MakiWolf/netcoredbg
branch = master
2 changes: 1 addition & 1 deletion main/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<NuGetVersionMicrosoftTestPlatform>16.11.0</NuGetVersionMicrosoftTestPlatform>
<NuGetVersionMonoDevelopAnalyzers>0.1.0.2</NuGetVersionMonoDevelopAnalyzers>
<NuGetVersionNewtonsoftJson>13.0.3</NuGetVersionNewtonsoftJson>
<NuGetVersionNuGet>5.8.0</NuGetVersionNuGet>
<NuGetVersionNuGet>5.8.1</NuGetVersionNuGet>
<NuGetVersionNUnit2>2.7.1</NuGetVersionNUnit2>
<NuGetVersionNUnit3>3.16.3</NuGetVersionNUnit3>
<NuGetVersionVSCodeDebugProtocol>17.2.60629.1</NuGetVersionVSCodeDebugProtocol>
Expand Down
Empty file removed main/NEWS
Empty file.
2 changes: 1 addition & 1 deletion main/external/Samsung.Netcoredbg
2 changes: 1 addition & 1 deletion main/external/guiunit
Submodule guiunit updated 1 files
+1 −2 .gitignore
2 changes: 1 addition & 1 deletion main/external/mono-tools
Submodule mono-tools updated 89 files
+6 −0 CODE-OF-CONDUCT.md
+26 −18 LICENSE
+1 −1 Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
+1 −1 Mono.Profiler/heap-snapshot-explorer/Makefile.am
+1 −1 Mono.Profiler/heap-snapshot-viewer/Makefile.am
+1 −1 Mono.Profiler/mprof-gui/Makefile.am
+1 −1 Mono.Profiler/profiler-decoder-library/Makefile.am
+1 −1 Mono.Profiler/profiler-file-decoder/Makefile.am
+59 −29 configure.in
+3 −0 create-native-map/man/create-native-map.1
+1 −1 create-native-map/src/Makefile.am
+21 −5 create-native-map/src/TestMap.cs
+18 −9 create-native-map/src/create-native-map.cs
+86 −0 create-native-map/src/test.c.ref
+64 −0 create-native-map/src/test.cs.ref
+32 −0 create-native-map/src/test.h.ref
+2 −2 docbrowser/Makefile.am
+1 −1 gendarme/console/ConsoleRunner.cs
+1 −1 gendarme/console/XmlResultWriter.cs
+18 −23 gendarme/console/gendarme.csproj
+4 −0 gendarme/console/packages.config
+1 −1 gendarme/framework/Gendarme.Framework.Helpers/PrimitiveReferences.cs
+1 −1 gendarme/framework/Gendarme.Framework.Rocks/MethodRocks.cs
+1 −1 gendarme/framework/Gendarme.Framework.Rocks/ModuleRocks.cs
+5 −5 gendarme/framework/Gendarme.Framework.Rocks/TypeRocks.cs
+3 −2 gendarme/framework/Gendarme.Framework.Rocks/VariableDefinitionRocks.cs
+13 −6 gendarme/framework/Gendarme.Framework.csproj
+1 −1 gendarme/framework/Gendarme.Framework/AssemblyResolver.cs
+22 −16 gendarme/framework/Gendarme.Framework/Symbols.cs
+3 −4 gendarme/framework/Test/Tests.Framework.csproj
+4 −0 gendarme/framework/packages.config
+7 −9 gendarme/gendarme.sln
+9 −10 gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj
+2 −1 gendarme/rules/Gendarme.Rules.Concurrency/ProtectCallToEventDelegatesRule.cs
+4 −2 gendarme/rules/Gendarme.Rules.Correctness/AvoidCodeWithSideEffectsInConditionalCodeRule.cs
+2 −1 gendarme/rules/Gendarme.Rules.Correctness/EnsureLocalDisposalRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj
+4 −2 gendarme/rules/Gendarme.Rules.Correctness/ReviewDoubleAssignmentRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Design.Generic/Gendarme.Rules.Design.Generic.csproj
+3 −4 gendarme/rules/Gendarme.Rules.Design.Linq/Gendarme.Rules.Design.Linq.csproj
+2 −2 gendarme/rules/Gendarme.Rules.Design/AvoidRefAndOutParametersRule.cs
+2 −2 gendarme/rules/Gendarme.Rules.Design/ConsiderAddingInterfaceRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Design/Gendarme.Rules.Design.csproj
+3 −3 gendarme/rules/Gendarme.Rules.Design/ImplementIComparableCorreclyRule.cs
+2 −2 gendarme/rules/Gendarme.Rules.Design/UseCorrectDisposeSignaturesRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Exceptions/Gendarme.Rules.Exceptions.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Gendarme/Gendarme.Rules.Gendarme.csproj
+3 −4 gendarme/rules/Gendarme.Rules.Globalization/Gendarme.Rules.Globalization.csproj
+1 −1 gendarme/rules/Gendarme.Rules.Globalization/SatelliteResourceMismatchRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Interoperability.Com/Gendarme.Rules.Interoperability.Com.csproj
+3 −4 gendarme/rules/Gendarme.Rules.Interoperability/Gendarme.Rules.Interoperability.csproj
+6 −6 gendarme/rules/Gendarme.Rules.Maintainability/AvoidUnnecessarySpecializationRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Maintainability/Gendarme.Rules.Maintainability.csproj
+7 −2 gendarme/rules/Gendarme.Rules.Maintainability/PreferStringIsNullOrEmptyRule.cs
+3 −3 gendarme/rules/Gendarme.Rules.Maintainability/RemoveDependenceOnObsoleteCodeRule.cs
+3 −2 gendarme/rules/Gendarme.Rules.Maintainability/VariableNamesShouldNotMatchFieldNamesRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.NUnit/Gendarme.Rules.NUnit.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Naming/Gendarme.Rules.Naming.csproj
+2 −2 gendarme/rules/Gendarme.Rules.Naming/ParameterNamesShouldMatchOverridenMethodRule.cs
+2 −2 gendarme/rules/Gendarme.Rules.Naming/UseCorrectSuffixRule.cs
+1 −1 gendarme/rules/Gendarme.Rules.Performance/AvoidConcatenatingCharsRule.cs
+2 −2 gendarme/rules/Gendarme.Rules.Performance/AvoidUncalledPrivateCodeRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Performance/Gendarme.Rules.Performance.csproj
+2 −1 gendarme/rules/Gendarme.Rules.Performance/RemoveUnusedLocalVariablesRule.cs
+6 −2 gendarme/rules/Gendarme.Rules.Portability/DoNotHardcodePathsRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Portability/Gendarme.Rules.Portability.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Security.Cas/Gendarme.Rules.Security.Cas.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Security/Gendarme.Rules.Security.csproj
+3 −4 gendarme/rules/Gendarme.Rules.Serialization/Gendarme.Rules.Serialization.csproj
+1 −1 gendarme/rules/Gendarme.Rules.Smells/AvoidLongMethodsRule.cs
+9 −10 gendarme/rules/Gendarme.Rules.Smells/Gendarme.Rules.Smells.csproj
+9 −10 gendarme/rules/Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj
+23 −24 gendarme/rules/README.md
+3 −4 gendarme/rules/Test.Rules/Test.Rules.csproj
+1 −1 gendarme/swf-wizard-runner/Makefile.am
+2 −2 gui-compare/CecilMetadata.cs
+6 −4 gui-compare/CompareContext.cs
+6 −0 gui-compare/InfoManager.cs
+1 −1 gui-compare/Makefile.am
+2 −1 gui-compare/MasterMetadata.cs
+1 −1 ilcontrast/Makefile.am
+3 −3 minvoke/Makefile.am
+1 −1 mperfmon/Makefile.am
+1 −5 webdoc/Makefile.am
+9 −1 windoc/WinDoc/CustomDrawing.cs
+9 −2 windoc/WinDoc/MainWindow.Designer.cs
+6 −0 windoc/WinDoc/MainWindow.cs
+69 −69 windoc/WinDoc/MainWindow.resx
Binary file removed main/external/nuget-binary/Lucene.Net.dll
Binary file not shown.
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Commands.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Common.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Configuration.dll
Binary file not shown.
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Frameworks.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Indexing.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.LibraryModel.dll
Binary file not shown.
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Packaging.Core.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Packaging.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.ProjectModel.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Protocol.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Resolver.dll
Binary file not shown.
Binary file removed main/external/nuget-binary/NuGet.Versioning.dll
Binary file not shown.
Binary file modified main/external/nuget-binary/nuget.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions main/msbuild/ReferencesVSEditor.Windows.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(NuGetVersionRoslyn)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(NuGetVersionVSEditor)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="2.8.0" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<PackageReference Include="Microsoft.CodeAnalysis.InteractiveHost" Version="$(NuGetVersionRoslyn)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<!--<PackageReference Include="Microsoft.CodeAnalysis.InteractiveHost" Version="$(NuGetVersionRoslyn)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />-->
</ItemGroup>

<!-- The consolidated package is authored in a way to avoid adding it to the C# compiler (ref\net46 is empty).
Expand All @@ -25,9 +25,9 @@
<Reference Include="$(NuGetPackageRoot)Microsoft.VisualStudio.Platform.VSEditor\$(NuGetVersionVSEditor)\lib\net472\Microsoft.VisualStudio.Platform.VSEditor.dll">
<Private>false</Private>
</Reference>
<Reference Include="$(NuGetPackageRoot)Microsoft.CodeAnalysis.InteractiveHost\$(NuGetVersionRoslyn)\lib\net472\Microsoft.CodeAnalysis.InteractiveHost.dll">
<!--<Reference Include="$(NuGetPackageRoot)Microsoft.CodeAnalysis.InteractiveHost\$(NuGetVersionRoslyn)\lib\net472\Microsoft.CodeAnalysis.InteractiveHost.dll">
<Private>$(ReferencesVSEditorCopyToOutput)</Private>
</Reference>
</Reference>-->
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
using Roslyn.Utilities;
using Microsoft.CodeAnalysis.Options;
using MonoDevelop.CSharp.OptionProvider;
using Microsoft.VisualStudio.CodingConventions;
//using Microsoft.VisualStudio.CodingConventions;
using System.Linq;
using System.Collections.Immutable;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -143,34 +143,34 @@ protected override ITextSource FormatImplementation (PolicyContainer policyParen
var textPolicy = policyParent.Get<TextStylePolicy> (chain);
var optionSet = policy.CreateOptions (textPolicy);

if (input is IReadonlyTextDocument doc) {
/* if (input is IReadonlyTextDocument doc) {
try {
var conventions = EditorConfigService.GetEditorConfigContext (doc.FileName).WaitAndGetResult ();
if (conventions != null)
optionSet = new FormattingDocumentOptionSet (optionSet, new DocumentOptions (optionSet, conventions.CurrentConventions));
} catch (Exception e) {
LoggingService.LogError ("Error while loading coding conventions.", e);
}
}
} */

return new StringTextSource (FormatText (optionSet, input.Text, startOffset, startOffset + length));
}

sealed class DocumentOptions : IDocumentOptions
/* sealed class DocumentOptions : IDocumentOptions
{
readonly OptionSet optionSet;
readonly ICodingConventionsSnapshot codingConventionsSnapshot;
private static readonly ConditionalWeakTable<IReadOnlyDictionary<string, object>, IReadOnlyDictionary<string, string>> s_convertedDictionaryCache =
new ConditionalWeakTable<IReadOnlyDictionary<string, object>, IReadOnlyDictionary<string, string>> ();


public DocumentOptions (OptionSet optionSet, ICodingConventionsSnapshot codingConventionsSnapshot)
public DocumentOptions (OptionSet optionSet, ICodingConventionsSnapshot codingConventionsSnapshot)
{
this.optionSet = optionSet;
this.codingConventionsSnapshot = codingConventionsSnapshot;
}

public bool TryGetDocumentOption (OptionKey option, out object value)
public bool TryGetDocumentOption (OptionKey option, out object value)
{
if (codingConventionsSnapshot != null) {
var editorConfigPersistence = option.Option.StorageLocations.OfType<IEditorConfigStorageLocation> ().SingleOrDefault ();
Expand Down Expand Up @@ -198,8 +198,8 @@ public bool TryGetDocumentOption (OptionKey option, out object value)
var result = optionSet.GetOption (option);
value = result;
return true;
}
}
}
} */

sealed class FormattingDocumentOptionSet : OptionSet
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
/* using System;
using System.ComponentModel.Composition;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -54,12 +54,12 @@ async Task<IDocumentOptions> IDocumentOptionsProvider.GetOptionsForDocumentAsync

var path = GetPath (document);
ICodingConventionContext conventions = null;
try {
if (path != null)
conventions = await EditorConfigService.GetEditorConfigContext (path, cancellationToken);
} catch (Exception e) {
LoggingService.LogError("Error while loading coding conventions.", e);
}
try {
if (path != null)
//conventions = await EditorConfigService.GetEditorConfigContext (path, cancellationToken);
} catch (Exception e) {
LoggingService.LogError("Error while loading coding conventions.", e);
}
return new DocumentOptions (project?.Policies, conventions?.CurrentConventions);
}

Expand Down Expand Up @@ -155,3 +155,4 @@ public bool TryGetDocumentOption (OptionKey option, out object value)
}
}
}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
/* using System;
using System.ComponentModel.Composition;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Options;
Expand All @@ -39,3 +39,4 @@ public IDocumentOptionsProvider TryCreate (Workspace workspace)
}
}
}
*/
Loading