From f652e42cced7ed58924a2009138890f2908760a2 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Mon, 7 Feb 2022 02:15:22 +0100 Subject: [PATCH 1/4] Copyright upgrade --- LICENSE | 2 +- src/NuReflector/CommonClasses.cs | 2 +- src/NuReflector/InternalConst.cs | 2 +- src/NuReflector/NuReflector.cs | 2 +- src/NuReflector/NuReflector.csproj | 2 +- src/NuReflectorCLI/NuReflectorCLI.csproj | 2 +- src/NuReflectorCLI/Program.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 991813226..5c9d0b05d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 MASES s.r.l. +Copyright (c) 2022 MASES s.r.l. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/NuReflector/CommonClasses.cs b/src/NuReflector/CommonClasses.cs index b01da7ff5..95a533744 100644 --- a/src/NuReflector/CommonClasses.cs +++ b/src/NuReflector/CommonClasses.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2021 MASES s.r.l. + * Copyright (c) 2022 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/NuReflector/InternalConst.cs b/src/NuReflector/InternalConst.cs index 5cba30178..184000bc5 100644 --- a/src/NuReflector/InternalConst.cs +++ b/src/NuReflector/InternalConst.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2021 MASES s.r.l. + * Copyright (c) 2022 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/NuReflector/NuReflector.cs b/src/NuReflector/NuReflector.cs index 29340b664..6eb36e460 100644 --- a/src/NuReflector/NuReflector.cs +++ b/src/NuReflector/NuReflector.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2021 MASES s.r.l. + * Copyright (c) 2022 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/NuReflector/NuReflector.csproj b/src/NuReflector/NuReflector.csproj index 49e97bbac..ccb7566f9 100644 --- a/src/NuReflector/NuReflector.csproj +++ b/src/NuReflector/NuReflector.csproj @@ -4,7 +4,7 @@ MASES.NuReflector NuReflector - a reflector engine for NuGet packages NuReflector - a reflector engine for NuGet packages - Copyright © MASES s.r.l. 2021 + Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. MASES s.r.l. diff --git a/src/NuReflectorCLI/NuReflectorCLI.csproj b/src/NuReflectorCLI/NuReflectorCLI.csproj index 7720bcbd3..61ddb2a37 100644 --- a/src/NuReflectorCLI/NuReflectorCLI.csproj +++ b/src/NuReflectorCLI/NuReflectorCLI.csproj @@ -5,7 +5,7 @@ MASES.NuReflectorCLI NuReflector CLI - CLI interface for NuReflector Engine NuReflector CLI - CLI interface for NuReflector Engine - Copyright © MASES s.r.l. 2021 + Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. 1.2.0.0 diff --git a/src/NuReflectorCLI/Program.cs b/src/NuReflectorCLI/Program.cs index fb1db2941..e713f0006 100644 --- a/src/NuReflectorCLI/Program.cs +++ b/src/NuReflectorCLI/Program.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2021 MASES s.r.l. + * Copyright (c) 2022 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal From 20edda8328577eac06acf81a575e7188c829b796 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 3 Mar 2022 23:36:14 +0100 Subject: [PATCH 2/4] Version check upgrade --- src/NuReflector/InternalConst.cs | 2 +- src/NuReflector/NuReflector.cs | 12 +++++++----- src/NuReflector/NuReflector.csproj | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/NuReflector/InternalConst.cs b/src/NuReflector/InternalConst.cs index 184000bc5..eb9807dbd 100644 --- a/src/NuReflector/InternalConst.cs +++ b/src/NuReflector/InternalConst.cs @@ -24,7 +24,7 @@ using System; -namespace MASES.CLIParser +namespace MASES.NuReflector { class InternalConst { diff --git a/src/NuReflector/NuReflector.cs b/src/NuReflector/NuReflector.cs index 6eb36e460..aeac8c39c 100644 --- a/src/NuReflector/NuReflector.cs +++ b/src/NuReflector/NuReflector.cs @@ -271,13 +271,15 @@ public static string GetArgumentHelp() return sb.ToString(); } - static bool checkFramework(this NuGetFramework framework) + static bool CheckFramework(this NuGetFramework framework) { return framework == NuGetFramework.AnyFramework -#if NET6_0_OR_GREATER +#if NETSTARDAND_FALLBACK || framework.Framework == InternalConst.Framework.NetStandardRuntime // .NETStandard fallback to .NET 6 #endif - || (framework.Framework == JobManager.RuntimeName && framework.Version >= InternalConst.Framework.Version); + || (framework.Framework == JobManager.RuntimeName + && framework.Version.Major == InternalConst.Framework.Version.Major + && framework.Version >= InternalConst.Framework.Version); } static string ToFolder(string packageId, NuGetVersion packageVersion) @@ -406,7 +408,7 @@ public bool DownloadAndPrepare(IList parsedPackages, string pac Version version = new Version(); foreach (FrameworkSpecificGroup libItem in packageReader.GetLibItems()) { - if (libItem.TargetFramework.checkFramework() && libItem.TargetFramework.Version > version) + if (libItem.TargetFramework.CheckFramework() && libItem.TargetFramework.Version > version) { if (libItem.HasEmptyFolder) continue; appendToConsole($"Storing temporary {libItem.TargetFramework} of {packageId}:{packageVersion}"); @@ -423,7 +425,7 @@ public bool DownloadAndPrepare(IList parsedPackages, string pac foreach (var depItem in packageReader.GetPackageDependencies()) { - if (depItem.TargetFramework.checkFramework() && depItem.TargetFramework.Version == version) + if (depItem.TargetFramework.CheckFramework() && depItem.TargetFramework.Version == version) { foreach (var packItem in depItem.Packages) { diff --git a/src/NuReflector/NuReflector.csproj b/src/NuReflector/NuReflector.csproj index 19a719829..753bb3e29 100644 --- a/src/NuReflector/NuReflector.csproj +++ b/src/NuReflector/NuReflector.csproj @@ -29,6 +29,9 @@ ..\Common\NuReflector.snk README.md + + $(DefineConstants);NETSTARDAND_FALLBACK + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) From 27805496cdebb79a99929d9f60f1118c1de0e6bf Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Fri, 4 Mar 2022 02:14:52 +0100 Subject: [PATCH 3/4] #11: upgrade to latest JCOReflectorEngine which reports this issue as solved --- src/NuReflector/NuReflector.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuReflector/NuReflector.csproj b/src/NuReflector/NuReflector.csproj index 753bb3e29..8680d1f9f 100644 --- a/src/NuReflector/NuReflector.csproj +++ b/src/NuReflector/NuReflector.csproj @@ -54,7 +54,7 @@ - + All None From 89980e8b5b05e90c407ae9a83da86b077ad478da Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Fri, 4 Mar 2022 02:19:40 +0100 Subject: [PATCH 4/4] Added gitignore files --- .gitignore | 1 + src/.gitignore | 344 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 345 insertions(+) create mode 100644 .gitignore create mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..65776c32f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/bin/ \ No newline at end of file diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 000000000..99b2645d0 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,344 @@ +QueryBaseline.txt + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates +*launchSettings.json +.AssemblyAttributes + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +.dotnet/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +.packages/ +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/