Skip to content

Commit f318d52

Browse files
sasha-matsasha-mat
committed
если что, надо это откатить
1 parent e84c1de commit f318d52

File tree

6 files changed

+68
-30
lines changed

6 files changed

+68
-30
lines changed

‎Source Code/M-Unity's Weird Website/Assembly-CSharp.csproj‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="Current">
32
<!-- Generated file, do not modify, your changes will be overwritten (use AssetPostprocessor.OnGeneratedCSProject) -->
43
<PropertyGroup>
5-
<LangVersion>9.0</LangVersion>
4+
<BaseIntermediateOutputPath>Temp\obj\$(Configuration)\$(MSBuildProjectName)</BaseIntermediateOutputPath>
5+
<IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
66
</PropertyGroup>
7+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
8+
<ItemGroup>
9+
<ProjectCapability Include="Unity" />
10+
</ItemGroup>
711
<PropertyGroup>
12+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
13+
<EnableDefaultItems>false</EnableDefaultItems>
14+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
15+
<LangVersion>9.0</LangVersion>
16+
<Configurations>Debug;Release</Configurations>
817
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
918
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
10-
<ProductVersion>10.0.20506</ProductVersion>
11-
<SchemaVersion>2.0</SchemaVersion>
1219
<RootNamespace></RootNamespace>
13-
<ProjectGuid>{32FC2D6E-06A6-8EAA-4ACD-5D8E354BB81E}</ProjectGuid>
1420
<OutputType>Library</OutputType>
1521
<AppDesignerFolder>Properties</AppDesignerFolder>
1622
<AssemblyName>Assembly-CSharp</AssemblyName>
17-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
18-
<FileAlignment>512</FileAlignment>
23+
<TargetFramework>netstandard2.1</TargetFramework>
1924
<BaseDirectory>.</BaseDirectory>
2025
</PropertyGroup>
2126
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,23 +44,22 @@
3944
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
4045
</PropertyGroup>
4146
<PropertyGroup>
42-
<NoConfig>true</NoConfig>
47+
<NoStandardLibraries>true</NoStandardLibraries>
4348
<NoStdLib>true</NoStdLib>
44-
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
45-
<ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
46-
<ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
49+
<NoConfig>true</NoConfig>
50+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
51+
<MSBuildWarningsAsMessages>MSB3277</MSBuildWarningsAsMessages>
4752
</PropertyGroup>
4853
<PropertyGroup>
49-
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
5054
<UnityProjectGenerator>Package</UnityProjectGenerator>
5155
<UnityProjectGeneratorVersion>2.0.22</UnityProjectGeneratorVersion>
52-
<UnityProjectGeneratorStyle>Legacy</UnityProjectGeneratorStyle>
56+
<UnityProjectGeneratorStyle>SDK</UnityProjectGeneratorStyle>
5357
<UnityProjectType>Game:1</UnityProjectType>
5458
<UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
5559
<UnityVersion>6000.0.23f1</UnityVersion>
5660
</PropertyGroup>
5761
<ItemGroup>
58-
<Analyzer Include="C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Microsoft\Visual Studio Tools for Unity\Analyzers\Microsoft.Unity.Analyzers.dll" />
62+
<Analyzer Include="C:\Users\Elena\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
5963
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
6064
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
6165
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
@@ -66,6 +70,7 @@
6670
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_TextSelector_A.cs" />
6771
<Compile Include="Assets\[5MBD]\Scripts\MainMenu.cs" />
6872
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\Benchmark02.cs" />
73+
<Compile Include="Assets\Scripts\Proverka.cs" />
6974
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_ExampleScript_01.cs" />
7075
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMPro_InstructionOverlay.cs" />
7176
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\VertexShakeB.cs" />
@@ -81,6 +86,7 @@
8186
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\ShaderPropAnimator.cs" />
8287
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_TextInfoDebugTool.cs" />
8388
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\VertexShakeA.cs" />
89+
<Compile Include="Assets\Scripts\ObjectSwitcher.cs" />
8490
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\Benchmark01_UGUI.cs" />
8591
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\SimpleScript.cs" />
8692
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\Benchmark04.cs" />
@@ -620,6 +626,14 @@
620626
<HintPath>Library\PackageCache\com.unity.nuget.mono-cecil\Mono.Cecil.dll</HintPath>
621627
<Private>False</Private>
622628
</Reference>
629+
<Reference Include="Unity.Android.Types">
630+
<HintPath>C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath>
631+
<Private>False</Private>
632+
</Reference>
633+
<Reference Include="Unity.Android.Gradle">
634+
<HintPath>C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll</HintPath>
635+
<Private>False</Private>
636+
</Reference>
623637
<Reference Include="netstandard">
624638
<HintPath>C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath>
625639
<Private>False</Private>
@@ -1358,18 +1372,18 @@
13581372
</Reference>
13591373
</ItemGroup>
13601374
<ItemGroup>
1361-
<ProjectReference Include="DOTween.Modules.csproj">
1362-
<Project>{BB9FB294-48FB-EC28-D84B-AB93478E9080}</Project>
1363-
<Name>DOTween.Modules</Name>
1364-
</ProjectReference>
1375+
<ProjectReference Include="DOTween.Modules.csproj" />
1376+
</ItemGroup>
1377+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1378+
<ItemGroup>
1379+
<ProjectCapability Remove="LaunchProfiles" />
1380+
<ProjectCapability Remove="SharedProjectReferences" />
1381+
<ProjectCapability Remove="ReferenceManagerSharedProjects" />
1382+
<ProjectCapability Remove="ProjectReferences" />
1383+
<ProjectCapability Remove="ReferenceManagerProjects" />
1384+
<ProjectCapability Remove="COMReferences" />
1385+
<ProjectCapability Remove="ReferenceManagerCOM" />
1386+
<ProjectCapability Remove="AssemblyReferences" />
1387+
<ProjectCapability Remove="ReferenceManagerAssemblies" />
13651388
</ItemGroup>
1366-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1367-
<Target Name="GenerateTargetFrameworkMonikerAttribute" />
1368-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
1369-
Other similar extension points exist, see Microsoft.Common.targets.
1370-
<Target Name="BeforeBuild">
1371-
</Target>
1372-
<Target Name="AfterBuild">
1373-
</Target>
1374-
-->
13751389
</Project>

‎Source Code/M-Unity's Weird Website/Assets/Materials.meta‎

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

‎Source Code/M-Unity's Weird Website/Assets/Scenes.meta‎

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

‎Source Code/M-Unity's Weird Website/Assets/Scripts.meta‎

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

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Models/RunningCactus/Materials/roomRunningCactus-Magenta.mat.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Models/RunningCactus/Materials/roomRunningCactus-Yellow.mat.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)