Browse Source

Translation warnings, Modify appveyor.yml file to package satellite file

pull/1299/head
MysticBoy 7 years ago
parent
commit
382afe75b3
  1. 8
      ILSpy/Languages/CSharpLanguage.cs
  2. 2
      appveyor.yml

8
ILSpy/Languages/CSharpLanguage.cs

@ -289,9 +289,9 @@ namespace ICSharpCode.ILSpy
var loadedAssembly = MainWindow.Instance.CurrentAssemblyList.GetAssemblies().FirstOrDefault(la => la.GetPEFileOrNull() == module); var loadedAssembly = MainWindow.Instance.CurrentAssemblyList.GetAssemblies().FirstOrDefault(la => la.GetPEFileOrNull() == module);
if (loadedAssembly == null || !loadedAssembly.LoadedAssemblyReferencesInfo.HasErrors) if (loadedAssembly == null || !loadedAssembly.LoadedAssemblyReferencesInfo.HasErrors)
return; return;
const string line1 = "Warning: Some assembly references could not be resolved automatically. This might lead to incorrect decompilation of some parts,"; string line1 = Properties.Resources.WarningSomeAssemblyReference;
const string line2 = "for ex. property getter/setter access. To get optimal decompilation results, please manually add the missing references to the list of loaded assemblies."; string line2 = Properties.Resources.PropertyManuallyMissingReferencesListLoadedAssemblies;
AddWarningMessage(module, output, line1, line2, "Show assembly load log", Images.ViewCode, delegate { AddWarningMessage(module, output, line1, line2, Properties.Resources.ShowAssemblyLoad, Images.ViewCode, delegate {
MainWindow.Instance.SelectNode(MainWindow.Instance.FindTreeNode(module).Children.OfType<ReferenceFolderTreeNode>().First()); MainWindow.Instance.SelectNode(MainWindow.Instance.FindTreeNode(module).Children.OfType<ReferenceFolderTreeNode>().First());
}); });
} }
@ -301,7 +301,7 @@ namespace ICSharpCode.ILSpy
var metadata = module.Metadata; var metadata = module.Metadata;
if (!metadata.GetCustomAttributes(Handle.AssemblyDefinition).HasKnownAttribute(metadata, KnownAttribute.ReferenceAssembly)) if (!metadata.GetCustomAttributes(Handle.AssemblyDefinition).HasKnownAttribute(metadata, KnownAttribute.ReferenceAssembly))
return; return;
const string line1 = "Warning: This assembly is marked as 'reference assembly', which means that it only contains metadata and no executable code."; string line1 = Properties.Resources.WarningAsmMarkedRef;
AddWarningMessage(module, output, line1); AddWarningMessage(module, output, line1);
} }

2
appveyor.yml

@ -15,7 +15,7 @@ before_build:
build_script: build_script:
- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
after_build: after_build:
- 7z a ILSpy_binaries.zip %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.dll %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.exe %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.config - 7z a ILSpy_binaries.zip %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.dll %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.exe %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.config %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\zh-Hans\ILSpy.resources.dll
test: test:
assemblies: assemblies:
- 'ICSharpCode.Decompiler.Tests\bin\%configuration%\net46\ICSharpCode.Decompiler.Tests.exe' - 'ICSharpCode.Decompiler.Tests\bin\%configuration%\net46\ICSharpCode.Decompiler.Tests.exe'

Loading…
Cancel
Save